Commit d1e137d6 authored by dickelbeck's avatar dickelbeck

Newest wxWidgets does not support wxString.GetData()

parent 7e93bb19
...@@ -101,19 +101,21 @@ void DIALOG_DESIGN_RULES::PrintCurrentSettings( ) ...@@ -101,19 +101,21 @@ void DIALOG_DESIGN_RULES::PrintCurrentSettings( )
wxString msg, value; wxString msg, value;
int internal_units = m_Parent->m_InternalUnits; int internal_units = m_Parent->m_InternalUnits;
m_MessagesList->AppendToPage(_("<b>Current general setting:</b><br>") ); m_MessagesList->AppendToPage(_("<b>Current general settings:</b><br>") );
// Display min values: // Display min values:
value = ReturnStringFromValue( g_UnitMetric, g_DesignSettings.m_TrackMinWidth, internal_units, true ); value = ReturnStringFromValue( g_UnitMetric, g_DesignSettings.m_TrackMinWidth, internal_units, true );
msg.Printf(_("Minimum value for tracks width: <b>%s</b><br>\n"), value.GetData() ); msg.Printf(_("Minimum value for tracks width: <b>%s</b><br>\n"), GetChars( value ) );
m_MessagesList->AppendToPage(msg); m_MessagesList->AppendToPage(msg);
value = ReturnStringFromValue( g_UnitMetric, g_DesignSettings.m_ViasMinSize, internal_units, true ); value = ReturnStringFromValue( g_UnitMetric, g_DesignSettings.m_ViasMinSize, internal_units, true );
msg.Printf(_("Minimum value for vias diameter: <b>%s</b><br>\n"), value.GetData() ); msg.Printf(_("Minimum value for vias diameter: <b>%s</b><br>\n"), GetChars( value ) );
m_MessagesList->AppendToPage(msg); m_MessagesList->AppendToPage(msg);
value = ReturnStringFromValue( g_UnitMetric, g_DesignSettings.m_MicroViasMinSize, internal_units, true ); value = ReturnStringFromValue( g_UnitMetric, g_DesignSettings.m_MicroViasMinSize, internal_units, true );
msg.Printf(_("Minimum value for microvias diameter: <b>%s</b><br>\n"), value.GetData() ); msg.Printf(_("Minimum value for microvias diameter: <b>%s</b><br>\n"), GetChars( value ) );
m_MessagesList->AppendToPage(msg); m_MessagesList->AppendToPage(msg);
} }
...@@ -159,7 +161,7 @@ void DIALOG_DESIGN_RULES::Init() ...@@ -159,7 +161,7 @@ void DIALOG_DESIGN_RULES::Init()
} }
InitializeRulesSelectionBoxes(); InitializeRulesSelectionBoxes();
PrintCurrentSettings( ); PrintCurrentSettings( );
} }
...@@ -382,7 +384,7 @@ void DIALOG_DESIGN_RULES::CopyRulesListToBoard() ...@@ -382,7 +384,7 @@ void DIALOG_DESIGN_RULES::CopyRulesListToBoard()
// Should not occur because OnAddNetclassClick() tests for existing NetClass names // Should not occur because OnAddNetclassClick() tests for existing NetClass names
wxString msg; wxString msg;
msg.Printf( wxT("CopyRulesListToBoard(): The NetClass \"%s\" already exists. Skip"), msg.Printf( wxT("CopyRulesListToBoard(): The NetClass \"%s\" already exists. Skip"),
m_grid->GetRowLabelValue( row ).GetData() ); GetChars( m_grid->GetRowLabelValue( row ) ) );
wxMessageBox( msg ); wxMessageBox( msg );
delete nc; delete nc;
continue; continue;
...@@ -525,7 +527,7 @@ void DIALOG_DESIGN_RULES::OnMoveUpSelectedNetClass( wxCommandEvent& event ) ...@@ -525,7 +527,7 @@ void DIALOG_DESIGN_RULES::OnMoveUpSelectedNetClass( wxCommandEvent& event )
m_grid->SetRowLabelValue(ii, previous_value ); m_grid->SetRowLabelValue(ii, previous_value );
m_grid->SetRowLabelValue(ii-1, curr_value ); m_grid->SetRowLabelValue(ii-1, curr_value );
} }
if( reinit ) if( reinit )
InitializeRulesSelectionBoxes(); InitializeRulesSelectionBoxes();
} }
...@@ -671,7 +673,7 @@ bool DIALOG_DESIGN_RULES::TestDataValidity() ...@@ -671,7 +673,7 @@ bool DIALOG_DESIGN_RULES::TestDataValidity()
m_MessagesList->AppendToPage( msg ); m_MessagesList->AppendToPage( msg );
} }
// Test vias // Test vias
int viadia = ReturnValueFromString( g_UnitMetric, int viadia = ReturnValueFromString( g_UnitMetric,
m_grid->GetCellValue( row, GRID_VIASIZE ), m_grid->GetCellValue( row, GRID_VIASIZE ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment