kicad-developers team mailing list archive
-
kicad-developers team
-
Mailing list archive
-
Message #36510
Re: 5.1 preview
Le 13/07/2018 à 06:19, Jeff Young a écrit :
> Thanks to some great help from Nick, I believe my 6.0 (aka 5.1) tree should compile cleanly on other
> platforms if any of you want to try it out.
>
> https://git.launchpad.net/~jeyjey/kicad/?h=6.0 <https://git.launchpad.net/%7Ejeyjey/kicad/?h=6.0>
>
> Cheers,
> Jeff.
>
Hi Jeff,
to compile your 6.0 branch, I had to make this fix (attached patch)
Most of issues are due to use of non existing wxWidgets functions like SetColumnWidth and
GetColumnWidth.
I don't know why it compile on your system, because they do not exist (at least in wxWidgets doc) in
2.8, 3.0 and 3.1 wxWidgets doc.
(3.1.1 version is the wxWidgets I am using on W7)
Cheers,
--
Jean-Pierre CHARRAS
common/dialogs/dialog_configure_paths.cpp | 24 +++++++++++-----------
common/widgets/wx_grid.cpp | 4 ++--
.../dialogs/dialog_edit_component_in_schematic.cpp | 6 +++---
eeschema/dialogs/dialog_edit_components_libid.cpp | 8 ++++----
.../dialogs/dialog_edit_libentry_fields_in_lib.cpp | 6 +++---
eeschema/dialogs/dialog_lib_edit_pin_table.cpp | 16 +++++++--------
eeschema/dialogs/dialog_sym_lib_table.cpp | 2 +-
.../dialogs/panel_eeschema_template_fieldnames.cpp | 6 +++---
eeschema/fields_grid_table.cpp | 4 ++--
.../dialog_edit_footprint_for_BoardEditor.cpp | 6 +++---
.../dialog_edit_footprint_for_fp_editor.cpp | 6 +++---
pcbnew/dialogs/dialog_fp_lib_table.cpp | 4 ++--
pcbnew/dialogs/dialog_fp_plugin_options.cpp | 4 ++--
.../dialogs/dialog_global_edit_tracks_and_vias.cpp | 6 +++---
pcbnew/dialogs/dialog_swap_layers.cpp | 4 ++--
pcbnew/dialogs/panel_setup_netclasses.cpp | 10 ++++-----
16 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/common/dialogs/dialog_configure_paths.cpp b/common/dialogs/dialog_configure_paths.cpp
index 675261c15..750dbb08c 100644
--- a/common/dialogs/dialog_configure_paths.cpp
+++ b/common/dialogs/dialog_configure_paths.cpp
@@ -442,7 +442,7 @@ void DIALOG_CONFIGURE_PATHS::OnGridCellRightClick( wxGridEvent& aEvent )
if( dlg.ShowModal() == wxID_OK )
{
wxGrid* grid = dynamic_cast<wxGrid*>( aEvent.GetEventObject() );
- grid->SetCellValue( dlg.GetPath(), aEvent.GetRow(), EV_PATH_COL );
+ grid->SetCellValue( aEvent.GetRow(), EV_PATH_COL, dlg.GetPath() );
m_curdir = dlg.GetPath();
}
}
@@ -453,23 +453,23 @@ void DIALOG_CONFIGURE_PATHS::OnGridCellRightClick( wxGridEvent& aEvent )
void DIALOG_CONFIGURE_PATHS::AdjustGridColumns( int aWidth )
{
m_EnvVars->AutoSizeColumn( EV_NAME_COL );
- m_EnvVars->SetColumnWidth( EV_NAME_COL,
- std::max( m_EnvVars->GetColumnWidth( EV_NAME_COL ), 120 ) );
+ m_EnvVars->SetColSize( EV_NAME_COL,
+ std::max( m_EnvVars->GetColSize( EV_NAME_COL ), 120 ) );
- m_EnvVars->SetColumnWidth( EV_PATH_COL,
- aWidth - m_EnvVars->GetColumnWidth( EV_NAME_COL ) );
+ m_EnvVars->SetColSize( EV_PATH_COL,
+ aWidth - m_EnvVars->GetColSize( EV_NAME_COL ) );
m_SearchPaths->AutoSizeColumn( SP_ALIAS_COL );
- m_SearchPaths->SetColumnWidth( SP_ALIAS_COL,
- std::max( m_SearchPaths->GetColumnWidth( SP_ALIAS_COL ), 120 ) );
+ m_SearchPaths->SetColSize( SP_ALIAS_COL,
+ std::max( m_SearchPaths->GetColSize( SP_ALIAS_COL ), 120 ) );
m_SearchPaths->AutoSizeColumn( SP_PATH_COL );
- m_SearchPaths->SetColumnWidth( SP_PATH_COL,
- std::max( m_SearchPaths->GetColumnWidth( SP_PATH_COL ), 300 ) );
+ m_SearchPaths->SetColSize( SP_PATH_COL,
+ std::max( m_SearchPaths->GetColSize( SP_PATH_COL ), 300 ) );
- m_SearchPaths->SetColumnWidth( SP_DESC_COL,
- aWidth - ( m_SearchPaths->GetColumnWidth( SP_ALIAS_COL )
- + m_SearchPaths->GetColumnWidth( SP_PATH_COL ) ) );
+ m_SearchPaths->SetColSize( SP_DESC_COL,
+ aWidth - ( m_SearchPaths->GetColSize( SP_ALIAS_COL )
+ + m_SearchPaths->GetColSize( SP_PATH_COL ) ) );
}
diff --git a/common/widgets/wx_grid.cpp b/common/widgets/wx_grid.cpp
index a4e123083..032421a82 100644
--- a/common/widgets/wx_grid.cpp
+++ b/common/widgets/wx_grid.cpp
@@ -33,12 +33,12 @@ void WX_GRID::SetTable( wxGridTableBase* aTable )
int formBuilderColWidths[ GetNumberCols() ];
for( int i = 0; i < GetNumberCols(); ++i )
- formBuilderColWidths[ i ] = GetColumnWidth( i );
+ formBuilderColWidths[ i ] = GetColSize( i );
wxGrid::SetTable( aTable );
for( int i = 0; i < GetNumberCols(); ++i )
- SetColumnWidth( i, formBuilderColWidths[ i ] );
+ SetColSize( i, formBuilderColWidths[ i ] );
}
diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
index 9dd8d15ff..102d0c8b6 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
@@ -694,12 +694,12 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::AdjustGridColumns( int aWidth )
m_grid->AutoSizeColumn( 0 );
- int fixedColsWidth = m_grid->GetColumnWidth( 0 );
+ int fixedColsWidth = m_grid->GetColSize( 0 );
for( int i = 2; i < m_grid->GetNumberCols(); i++ )
- fixedColsWidth += m_grid->GetColumnWidth( i );
+ fixedColsWidth += m_grid->GetColSize( i );
- m_grid->SetColumnWidth( 1, aWidth - fixedColsWidth );
+ m_grid->SetColSize( 1, aWidth - fixedColsWidth );
}
diff --git a/eeschema/dialogs/dialog_edit_components_libid.cpp b/eeschema/dialogs/dialog_edit_components_libid.cpp
index 975f4731b..6069d6785 100644
--- a/eeschema/dialogs/dialog_edit_components_libid.cpp
+++ b/eeschema/dialogs/dialog_edit_components_libid.cpp
@@ -241,7 +241,7 @@ int GRIDCELL_AUTOWRAP_STRINGRENDERER::GetHeight( wxDC& aDC, wxGrid* aGrid, int a
wxRect rect;
aDC.SetFont( attr->GetFont() );
- rect.SetWidth( aGrid->GetColumnWidth( aCol ) - ( 2 * GRID_CELL_MARGIN ) );
+ rect.SetWidth( aGrid->GetColSize( aCol ) - ( 2 * GRID_CELL_MARGIN ) );
const size_t numLines = GetTextLines( *aGrid, aDC, *attr, rect, aRow, aCol ).size();
const int textHeight = numLines *aDC.GetCharHeight();
@@ -540,7 +540,7 @@ void DIALOG_EDIT_COMPONENTS_LIBID::AddRowToGrid( bool aMarkRow, const wxString&
// wxWidgets' AutoRowHeight fails when used with wxGridCellAutoWrapStringRenderer
// (fixed in 2014, but didn't get in to wxWidgets 3.0.2)
wxClientDC dc( this );
- m_grid->SetRowHeight( row, m_autoWrapRenderer->GetHeight( dc, m_grid, row, COL_REFS ) );
+ m_grid->SetRowSize( row, m_autoWrapRenderer->GetHeight( dc, m_grid, row, COL_REFS ) );
}
@@ -817,7 +817,7 @@ void DIALOG_EDIT_COMPONENTS_LIBID::AdjustGridColumns( int aWidth )
m_grid->SetColSize( 0, aWidth / 3 );
m_grid->SetColSize( 1, aWidth / 3 );
- m_grid->SetColSize( 2, aWidth - m_grid->GetColumnWidth( 0 ) - m_grid->GetColumnWidth( 1 ) );
+ m_grid->SetColSize( 2, aWidth - m_grid->GetColSize( 0 ) - m_grid->GetColSize( 1 ) );
}
@@ -829,7 +829,7 @@ void DIALOG_EDIT_COMPONENTS_LIBID::OnSizeGrid( wxSizeEvent& event )
// wxWidgets' AutoRowHeight fails when used with wxGridCellAutoWrapStringRenderer
for( int row = 0; row < m_grid->GetNumberRows(); ++row )
- m_grid->SetRowHeight( row, m_autoWrapRenderer->GetHeight( dc, m_grid, row, COL_REFS ) );
+ m_grid->SetRowSize( row, m_autoWrapRenderer->GetHeight( dc, m_grid, row, COL_REFS ) );
event.Skip();
}
diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
index 4c6ecd611..183f01942 100644
--- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
+++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
@@ -440,12 +440,12 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::AdjustGridColumns( int aWidth )
m_grid->AutoSizeColumn( 0 );
- int fixedColsWidth = m_grid->GetColumnWidth( 0 );
+ int fixedColsWidth = m_grid->GetColSize( 0 );
for( int i = 2; i < m_grid->GetNumberCols(); i++ )
- fixedColsWidth += m_grid->GetColumnWidth( i );
+ fixedColsWidth += m_grid->GetColSize( i );
- m_grid->SetColumnWidth( 1, aWidth - fixedColsWidth );
+ m_grid->SetColSize( 1, aWidth - fixedColsWidth );
}
diff --git a/eeschema/dialogs/dialog_lib_edit_pin_table.cpp b/eeschema/dialogs/dialog_lib_edit_pin_table.cpp
index 04d43658e..3cd4112de 100644
--- a/eeschema/dialogs/dialog_lib_edit_pin_table.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_pin_table.cpp
@@ -355,7 +355,7 @@ DIALOG_LIB_EDIT_PIN_TABLE::DIALOG_LIB_EDIT_PIN_TABLE( wxWindow* parent, LIB_PART
// Save original columns widths so we can do proportional sizing.
for( int i = 0; i < COL_COUNT; ++i )
- m_originalColWidths[ i ] = m_grid->GetColumnWidth( i );
+ m_originalColWidths[ i ] = m_grid->GetColSize( i );
// Give a bit more room for combobox editors
m_grid->SetDefaultRowSize( m_grid->GetDefaultRowSize() + 4 );
@@ -548,24 +548,24 @@ void DIALOG_LIB_EDIT_PIN_TABLE::adjustGridColumns( int aWidth )
m_grid->AutoSizeColumn( COL_NUMBER );
- if( m_grid->GetColumnWidth( COL_NUMBER ) < m_originalColWidths[ COL_NUMBER ] )
- m_grid->SetColumnWidth( COL_NUMBER, m_originalColWidths[ COL_NUMBER ] );
+ if( m_grid->GetColSize( COL_NUMBER ) < m_originalColWidths[ COL_NUMBER ] )
+ m_grid->SetColSize( COL_NUMBER, m_originalColWidths[ COL_NUMBER ] );
m_grid->AutoSizeColumn( COL_NAME );
- if( m_grid->GetColumnWidth( COL_NAME ) < m_originalColWidths[ COL_NAME ] )
- m_grid->SetColumnWidth( COL_NAME, m_originalColWidths[ COL_NAME ] );
+ if( m_grid->GetColSize( COL_NAME ) < m_originalColWidths[ COL_NAME ] )
+ m_grid->SetColSize( COL_NAME, m_originalColWidths[ COL_NAME ] );
// If the grid is still wider than the columns, then stretch the Number and Name columns
// to fit.
for( int i = 0; i < COL_COUNT; ++i )
- aWidth -= m_grid->GetColumnWidth( i );
+ aWidth -= m_grid->GetColSize( i );
if( aWidth > 0 )
{
- m_grid->SetColumnWidth( COL_NUMBER, m_grid->GetColumnWidth( COL_NUMBER ) + aWidth / 2 );
- m_grid->SetColumnWidth( COL_NAME, m_grid->GetColumnWidth( COL_NAME ) + aWidth / 2 );
+ m_grid->SetColSize( COL_NUMBER, m_grid->GetColSize( COL_NUMBER ) + aWidth / 2 );
+ m_grid->SetColSize( COL_NAME, m_grid->GetColSize( COL_NAME ) + aWidth / 2 );
}
}
diff --git a/eeschema/dialogs/dialog_sym_lib_table.cpp b/eeschema/dialogs/dialog_sym_lib_table.cpp
index 266cab093..9e8335e22 100644
--- a/eeschema/dialogs/dialog_sym_lib_table.cpp
+++ b/eeschema/dialogs/dialog_sym_lib_table.cpp
@@ -650,7 +650,7 @@ void DIALOG_SYMBOL_LIB_TABLE::adjustPathSubsGridColumns( int aWidth )
aWidth -= ( m_path_subs_grid->GetSize().x - m_path_subs_grid->GetClientSize().x );
m_path_subs_grid->AutoSizeColumn( 0 );
- m_path_subs_grid->SetColumnWidth( 1, aWidth - m_path_subs_grid->GetColumnWidth( 0 ) );
+ m_path_subs_grid->SetColSize( 1, aWidth - m_path_subs_grid->GetColSize( 0 ) );
}
diff --git a/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp b/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp
index c4a66ddaf..c2a92e909 100644
--- a/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp
+++ b/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp
@@ -39,7 +39,7 @@ PANEL_EESCHEMA_TEMPLATE_FIELDNAMES::PANEL_EESCHEMA_TEMPLATE_FIELDNAMES( SCH_EDIT
m_addFieldButton->SetBitmap( KiBitmap( small_plus_xpm ) );
m_deleteFieldButton->SetBitmap( KiBitmap( trash_xpm ) );
- m_checkboxColWidth = m_grid->GetColumnWidth( 1 );
+ m_checkboxColWidth = m_grid->GetColSize( 1 );
}
@@ -148,8 +148,8 @@ void PANEL_EESCHEMA_TEMPLATE_FIELDNAMES::AdjustGridColumns( int aWidth )
// Account for scroll bars
aWidth -= ( m_grid->GetSize().x - m_grid->GetClientSize().x );
- m_grid->SetColumnWidth( 0, aWidth - m_checkboxColWidth );
- m_grid->SetColumnWidth( 1, m_checkboxColWidth );
+ m_grid->SetColSize( 0, aWidth - m_checkboxColWidth );
+ m_grid->SetColSize( 1, m_checkboxColWidth );
}
diff --git a/eeschema/fields_grid_table.cpp b/eeschema/fields_grid_table.cpp
index 6e6d57a9c..b0100a086 100644
--- a/eeschema/fields_grid_table.cpp
+++ b/eeschema/fields_grid_table.cpp
@@ -403,12 +403,12 @@ template class FIELDS_GRID_TABLE<LIB_FIELD>;
void FIELDS_GRID_TRICKS::showPopupMenu( wxMenu& menu )
{
- if( m_grid->GetCursorRow() == FOOTPRINT && m_grid->GetCursorColumn() == FDC_VALUE )
+ if( m_grid->GetGridCursorRow() == FOOTPRINT && m_grid->GetGridCursorCol() == FDC_VALUE )
{
menu.Append( MYID_SELECT_FOOTPRINT, _( "Select Footprint..." ), _( "Browse for footprint" ) );
menu.AppendSeparator();
}
- else if( m_grid->GetCursorRow() == DATASHEET && m_grid->GetCursorColumn() == FDC_VALUE )
+ else if( m_grid->GetGridCursorRow() == DATASHEET && m_grid->GetGridCursorCol() == FDC_VALUE )
{
menu.Append( MYID_SHOW_DATASHEET, _( "Show Datasheet" ), _( "Show datasheet in browser" ) );
menu.AppendSeparator();
diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp
index 542186876..b218109b6 100644
--- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp
+++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp
@@ -749,11 +749,11 @@ void DIALOG_FOOTPRINT_BOARD_EDITOR::adjustGridColumns( int aWidth )
itemsWidth -= m_itemsGrid->GetRowLabelSize();
for( int i = 1; i < m_itemsGrid->GetNumberCols(); i++ )
- itemsWidth -= m_itemsGrid->GetColumnWidth( i );
+ itemsWidth -= m_itemsGrid->GetColSize( i );
- m_itemsGrid->SetColumnWidth( 0, std::max( itemsWidth, 120 ) );
+ m_itemsGrid->SetColSize( 0, std::max( itemsWidth, 120 ) );
- m_modelsGrid->SetColumnWidth( 0, modelsWidth - m_modelsGrid->GetColumnWidth( 1 ) - 5 );
+ m_modelsGrid->SetColSize( 0, modelsWidth - m_modelsGrid->GetColSize( 1 ) - 5 );
}
diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp
index 68f8c764e..aaba6a5f8 100644
--- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp
+++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp
@@ -651,11 +651,11 @@ void DIALOG_FOOTPRINT_FP_EDITOR::adjustGridColumns( int aWidth )
itemsWidth -= m_itemsGrid->GetRowLabelSize();
for( int i = 1; i < m_itemsGrid->GetNumberCols(); i++ )
- itemsWidth -= m_itemsGrid->GetColumnWidth( i );
+ itemsWidth -= m_itemsGrid->GetColSize( i );
- m_itemsGrid->SetColumnWidth( 0, std::max( itemsWidth, 120 ) );
+ m_itemsGrid->SetColSize( 0, std::max( itemsWidth, 120 ) );
- m_modelsGrid->SetColumnWidth( 0, modelsWidth - m_modelsGrid->GetColumnWidth( 1 ) - 5 );
+ m_modelsGrid->SetColSize( 0, modelsWidth - m_modelsGrid->GetColSize( 1 ) - 5 );
}
diff --git a/pcbnew/dialogs/dialog_fp_lib_table.cpp b/pcbnew/dialogs/dialog_fp_lib_table.cpp
index f5a0eb6e4..206bcd970 100644
--- a/pcbnew/dialogs/dialog_fp_lib_table.cpp
+++ b/pcbnew/dialogs/dialog_fp_lib_table.cpp
@@ -185,7 +185,7 @@ protected:
void showPopupMenu( wxMenu& menu ) override
{
- if( m_grid->GetCursorColumn() == COL_OPTIONS )
+ if( m_grid->GetGridCursorCol() == COL_OPTIONS )
{
menu.Append( MYID_OPTIONS_EDITOR, _( "Options Editor..." ), _( "Edit options" ) );
menu.AppendSeparator();
@@ -668,7 +668,7 @@ void DIALOG_FP_LIB_TABLE::adjustPathSubsGridColumns( int aWidth )
aWidth -= ( m_path_subs_grid->GetSize().x - m_path_subs_grid->GetClientSize().x );
m_path_subs_grid->AutoSizeColumn( 0 );
- m_path_subs_grid->SetColumnWidth( 1, aWidth - m_path_subs_grid->GetColumnWidth( 0 ) );
+ m_path_subs_grid->SetColSize( 1, aWidth - m_path_subs_grid->GetColSize( 0 ) );
}
diff --git a/pcbnew/dialogs/dialog_fp_plugin_options.cpp b/pcbnew/dialogs/dialog_fp_plugin_options.cpp
index 5ae4b5148..72d0b27c2 100644
--- a/pcbnew/dialogs/dialog_fp_plugin_options.cpp
+++ b/pcbnew/dialogs/dialog_fp_plugin_options.cpp
@@ -267,9 +267,9 @@ private:
m_grid->Freeze();
m_grid->AutoSizeColumn( 0 );
- m_grid->SetColumnWidth( 0, std::max( 120, m_grid->GetColumnWidth( 0 ) ) );
+ m_grid->SetColSize( 0, std::max( 120, m_grid->GetColSize( 0 ) ) );
- m_grid->SetColumnWidth( 1, aWidth - m_grid->GetColumnWidth( 0 ) );
+ m_grid->SetColSize( 1, aWidth - m_grid->GetColSize( 0 ) );
m_grid->Thaw();
}
diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
index 76cab3eea..78b38130d 100644
--- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
+++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
@@ -94,7 +94,7 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS( PCB_EDIT
m_originalColWidths = new int[ m_netclassGrid->GetNumberCols() ];
for( int i = 0; i < m_netclassGrid->GetNumberCols(); ++i )
- m_originalColWidths[ i ] = m_netclassGrid->GetColumnWidth( i );
+ m_originalColWidths[ i ] = m_netclassGrid->GetColSize( i );
buildFilterLists();
@@ -301,11 +301,11 @@ void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::AdjustNetclassGridColumns( int aWidth )
{
for( int i = 1; i < m_netclassGrid->GetNumberCols(); i++ )
{
- m_netclassGrid->SetColumnWidth( i, m_originalColWidths[ i ] );
+ m_netclassGrid->SetColSize( i, m_originalColWidths[ i ] );
aWidth -= m_originalColWidths[ i ];
}
- m_netclassGrid->SetColumnWidth( 0, aWidth );
+ m_netclassGrid->SetColSize( 0, aWidth );
}
diff --git a/pcbnew/dialogs/dialog_swap_layers.cpp b/pcbnew/dialogs/dialog_swap_layers.cpp
index a471fc797..90adb324e 100644
--- a/pcbnew/dialogs/dialog_swap_layers.cpp
+++ b/pcbnew/dialogs/dialog_swap_layers.cpp
@@ -168,8 +168,8 @@ void DIALOG_SWAP_LAYERS::adjustGridColumns( int aWidth )
// Account for scroll bars
aWidth -= ( m_grid->GetSize().x - m_grid->GetClientSize().x );
- m_grid->SetColumnWidth( 0, aWidth / 2 );
- m_grid->SetColumnWidth( 1, aWidth - m_grid->GetColumnWidth( 0 ) );
+ m_grid->SetColSize( 0, aWidth / 2 );
+ m_grid->SetColSize( 1, aWidth - m_grid->GetColSize( 0 ) );
}
diff --git a/pcbnew/dialogs/panel_setup_netclasses.cpp b/pcbnew/dialogs/panel_setup_netclasses.cpp
index eb0797b17..383ff77d6 100644
--- a/pcbnew/dialogs/panel_setup_netclasses.cpp
+++ b/pcbnew/dialogs/panel_setup_netclasses.cpp
@@ -66,7 +66,7 @@ PANEL_SETUP_NETCLASSES::PANEL_SETUP_NETCLASSES( PAGED_DIALOG* aParent, PCB_EDIT_
m_originalColWidths = new int[ m_netclassGrid->GetNumberCols() ];
for( int i = 0; i < m_netclassGrid->GetNumberCols(); ++i )
- m_originalColWidths[ i ] = m_netclassGrid->GetColumnWidth( i );
+ m_originalColWidths[ i ] = m_netclassGrid->GetColSize( i );
// Membership combobox editors require a bit more room, so increase the row size of
// all our grids for consistency
@@ -475,11 +475,11 @@ void PANEL_SETUP_NETCLASSES::AdjustNetclassGridColumns( int aWidth )
for( int i = 1; i < m_netclassGrid->GetNumberCols(); i++ )
{
- m_netclassGrid->SetColumnWidth( i, m_originalColWidths[ i ] );
+ m_netclassGrid->SetColSize( i, m_originalColWidths[ i ] );
aWidth -= m_originalColWidths[ i ];
}
- m_netclassGrid->SetColumnWidth( 0, std::max( aWidth, m_originalColWidths[ 0 ] ) );
+ m_netclassGrid->SetColSize( 0, std::max( aWidth, m_originalColWidths[ 0 ] ) );
}
@@ -498,8 +498,8 @@ void PANEL_SETUP_NETCLASSES::AdjustMembershipGridColumns( int aWidth )
// Set className column width to original className width from netclasses grid
int classNameWidth = m_originalColWidths[ 0 ];
- m_membershipGrid->SetColumnWidth( 1, m_originalColWidths[ 0 ] );
- m_membershipGrid->SetColumnWidth( 0, std::max( aWidth - classNameWidth, classNameWidth ) );
+ m_membershipGrid->SetColSize( 1, m_originalColWidths[ 0 ] );
+ m_membershipGrid->SetColSize( 0, std::max( aWidth - classNameWidth, classNameWidth ) );
}
Follow ups
References
