Skip to content

K
kicad-source-mirror
Commit 283cfa67 authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files
Options

Set default button on all dialogs. Fixes lp:665703 

* Set default button on all dialogs that do not already have a defined
  default button.  The only exception is the EESchema net list dialog
  which needs converted over to wxFormBuilder and due to it's design makes
  setting the default button in any tab other than the default tab
  problematic.
* Fix escape key dialog handling bug in EESchema print post script
  dialog.
parent 81509a11
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1128 additions and 1120 deletions
common/dialogs/dialog_hotkeys_editor.cpp
View file @ 283cfa67
...@@ -66,7 +66,8 @@ HOTKEYS_EDITOR_DIALOG::HOTKEYS_EDITOR_DIALOG( EDA_DRAW_FRAME* pa ...@@ -66,7 +66,8 @@ HOTKEYS_EDITOR_DIALOG::HOTKEYS_EDITOR_DIALOG( EDA_DRAW_FRAME* pa
m_hotkeyGrid->SetReadOnly( i, 1, true ); m_hotkeyGrid->SetReadOnly( i, 1, true );
} }
SetFocus(); m_OKButton->SetDefault();
m_hotkeyGrid->SetFocus();
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
Center(); Center();
} }
......
common/dialogs/dialog_page_settings.cpp
View file @ 283cfa67
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "dialog_page_settings.h" #include "dialog_page_settings.h"
#define NB_ITEMS 11 #define NB_ITEMS 11
Ki_PageDescr * SheetList[NB_ITEMS + 1] = Ki_PageDescr* SheetList[NB_ITEMS + 1] =
{ {
&g_Sheet_A4, &g_Sheet_A3, &g_Sheet_A2, &g_Sheet_A1, &g_Sheet_A0, &g_Sheet_A4, &g_Sheet_A3, &g_Sheet_A2, &g_Sheet_A1, &g_Sheet_A0,
&g_Sheet_A, &g_Sheet_B, &g_Sheet_C, &g_Sheet_D, &g_Sheet_E, &g_Sheet_A, &g_Sheet_B, &g_Sheet_C, &g_Sheet_D, &g_Sheet_E,
...@@ -32,21 +32,17 @@ Ki_PageDescr * SheetList[NB_ITEMS + 1] = ...@@ -32,21 +32,17 @@ Ki_PageDescr * SheetList[NB_ITEMS + 1] =
}; };
void EDA_DRAW_FRAME::Process_PageSettings( wxCommandEvent& event )
/******************************************************************/
void EDA_DRAW_FRAME::Process_PageSettings(wxCommandEvent& event)
/******************************************************************/
/* Creation de la fenetre de configuration
*/
{ {
DIALOG_PAGES_SETTINGS frame(this); DIALOG_PAGES_SETTINGS frame( this );
int diag = frame.ShowModal(); int diag = frame.ShowModal();
if ( DrawPanel && diag )
if( DrawPanel && diag )
DrawPanel->Refresh(); DrawPanel->Refresh();
} }
DIALOG_PAGES_SETTINGS::DIALOG_PAGES_SETTINGS( EDA_DRAW_FRAME* parent ): DIALOG_PAGES_SETTINGS::DIALOG_PAGES_SETTINGS( EDA_DRAW_FRAME* parent ) :
DIALOG_PAGES_SETTINGS_BASE( parent ) DIALOG_PAGES_SETTINGS_BASE( parent )
{ {
m_Parent = parent; m_Parent = parent;
...@@ -55,16 +51,18 @@ DIALOG_PAGES_SETTINGS::DIALOG_PAGES_SETTINGS( EDA_DRAW_FRAME* parent ): ...@@ -55,16 +51,18 @@ DIALOG_PAGES_SETTINGS::DIALOG_PAGES_SETTINGS( EDA_DRAW_FRAME* parent ):
m_SelectedSheet = NULL; m_SelectedSheet = NULL;
m_CurrentSelection = 0; m_CurrentSelection = 0;
initDialog( ); initDialog();
GetSizer()->SetSizeHints(this); GetSizer()->SetSizeHints( this );
Centre(); Centre();
} }
DIALOG_PAGES_SETTINGS::~DIALOG_PAGES_SETTINGS() DIALOG_PAGES_SETTINGS::~DIALOG_PAGES_SETTINGS()
{ {
} }
void DIALOG_PAGES_SETTINGS::initDialog() void DIALOG_PAGES_SETTINGS::initDialog()
{ {
wxString msg; wxString msg;
...@@ -74,11 +72,11 @@ void DIALOG_PAGES_SETTINGS::initDialog() ...@@ -74,11 +72,11 @@ void DIALOG_PAGES_SETTINGS::initDialog()
// Init display value for sheet User size // Init display value for sheet User size
wxString format = m_TextSheetCount->GetLabel(); wxString format = m_TextSheetCount->GetLabel();
msg.Printf(format, m_Screen->m_NumberOfScreen); msg.Printf( format, m_Screen->m_NumberOfScreen );
m_TextSheetCount->SetLabel(msg); m_TextSheetCount->SetLabel( msg );
format = m_TextSheetNumber->GetLabel(); format = m_TextSheetNumber->GetLabel();
msg.Printf(format, m_Screen->m_ScreenNumber); msg.Printf( format, m_Screen->m_ScreenNumber );
m_TextSheetNumber->SetLabel(msg); m_TextSheetNumber->SetLabel( msg );
switch( g_UserUnit ) switch( g_UserUnit )
{ {
...@@ -111,24 +109,27 @@ void DIALOG_PAGES_SETTINGS::initDialog() ...@@ -111,24 +109,27 @@ void DIALOG_PAGES_SETTINGS::initDialog()
} }
// Set validators // Set validators
m_PageSizeBox->SetValidator( wxGenericValidator(& m_CurrentSelection) ); m_PageSizeBox->SetValidator( wxGenericValidator( &m_CurrentSelection ) );
m_TextRevision->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Revision) ); m_TextRevision->SetValidator( wxTextValidator( wxFILTER_NONE, &m_Screen->m_Revision ) );
m_TextTitle->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Title) ); m_TextTitle->SetValidator( wxTextValidator( wxFILTER_NONE, &m_Screen->m_Title ) );
m_TextCompany->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Company) ); m_TextCompany->SetValidator( wxTextValidator( wxFILTER_NONE, &m_Screen->m_Company ) );
m_TextComment1->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Commentaire1) ); m_TextComment1->SetValidator( wxTextValidator( wxFILTER_NONE, &m_Screen->m_Commentaire1 ) );
m_TextComment2->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Commentaire2) ); m_TextComment2->SetValidator( wxTextValidator( wxFILTER_NONE, &m_Screen->m_Commentaire2 ) );
m_TextComment3->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Commentaire3) ); m_TextComment3->SetValidator( wxTextValidator( wxFILTER_NONE, &m_Screen->m_Commentaire3 ) );
m_TextComment4->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Commentaire4) ); m_TextComment4->SetValidator( wxTextValidator( wxFILTER_NONE, &m_Screen->m_Commentaire4 ) );
#ifndef EESCHEMA #ifndef EESCHEMA
m_RevisionExport->Show(false); m_RevisionExport->Show( false );
m_TitleExport->Show(false); m_TitleExport->Show( false );
m_CompanyExport->Show(false); m_CompanyExport->Show( false );
m_Comment1Export->Show(false); m_Comment1Export->Show( false );
m_Comment2Export->Show(false); m_Comment2Export->Show( false );
m_Comment3Export->Show(false); m_Comment3Export->Show( false );
m_Comment4Export->Show(false); m_Comment4Export->Show( false );
#endif #endif
// Make the OK button the default.
m_sdbSizer1OK->SetDefault();
} }
...@@ -150,7 +151,7 @@ void DIALOG_PAGES_SETTINGS::OnOkClick( wxCommandEvent& event ) ...@@ -150,7 +151,7 @@ void DIALOG_PAGES_SETTINGS::OnOkClick( wxCommandEvent& event )
{ {
SavePageSettings( event ); SavePageSettings( event );
m_Modified = 1; m_Modified = 1;
Close( TRUE ); Close( true );
} }
...@@ -160,15 +161,11 @@ void DIALOG_PAGES_SETTINGS::OnOkClick( wxCommandEvent& event ) ...@@ -160,15 +161,11 @@ void DIALOG_PAGES_SETTINGS::OnOkClick( wxCommandEvent& event )
void DIALOG_PAGES_SETTINGS::OnCancelClick( wxCommandEvent& event ) void DIALOG_PAGES_SETTINGS::OnCancelClick( wxCommandEvent& event )
{ {
Close( TRUE ); Close( true );
} }
/*****************************************************************/ void DIALOG_PAGES_SETTINGS::SavePageSettings( wxCommandEvent& event )
void DIALOG_PAGES_SETTINGS::SavePageSettings(wxCommandEvent& event)
/*****************************************************************/
/* Mise a jour effective des textes et dimensions
*/
{ {
double dtmp; double dtmp;
wxString msg; wxString msg;
...@@ -182,10 +179,10 @@ void DIALOG_PAGES_SETTINGS::SavePageSettings(wxCommandEvent& event) ...@@ -182,10 +179,10 @@ void DIALOG_PAGES_SETTINGS::SavePageSettings(wxCommandEvent& event)
m_Screen->m_Commentaire4 = m_TextComment4->GetValue(); m_Screen->m_Commentaire4 = m_TextComment4->GetValue();
msg = m_TextUserSizeX->GetValue(); msg = m_TextUserSizeX->GetValue();
msg.ToDouble(&dtmp); msg.ToDouble( &dtmp );
UserSizeX = dtmp; UserSizeX = dtmp;
msg = m_TextUserSizeY->GetValue(); msg = m_TextUserSizeY->GetValue();
msg.ToDouble(&dtmp); msg.ToDouble( &dtmp );
UserSizeY = dtmp; UserSizeY = dtmp;
int ii = m_PageSizeBox->GetSelection(); int ii = m_PageSizeBox->GetSelection();
...@@ -228,9 +225,11 @@ void DIALOG_PAGES_SETTINGS::SavePageSettings(wxCommandEvent& event) ...@@ -228,9 +225,11 @@ void DIALOG_PAGES_SETTINGS::SavePageSettings(wxCommandEvent& event)
#ifdef EESCHEMA #ifdef EESCHEMA
/* Exports settings to other sheets if requested: */ /* Exports settings to other sheets if requested: */
SCH_SCREEN * screen; SCH_SCREEN* screen;
/* Build the screen list */ /* Build the screen list */
SCH_SCREENS ScreenList; SCH_SCREENS ScreenList;
/* Update the datas */ /* Update the datas */
for( screen = ScreenList.GetFirst(); screen != NULL; screen = ScreenList.GetNext() ) for( screen = ScreenList.GetFirst(); screen != NULL; screen = ScreenList.GetNext() )
{ {
...@@ -241,7 +240,7 @@ void DIALOG_PAGES_SETTINGS::SavePageSettings(wxCommandEvent& event) ...@@ -241,7 +240,7 @@ void DIALOG_PAGES_SETTINGS::SavePageSettings(wxCommandEvent& event)
screen->m_Revision = m_Screen->m_Revision; screen->m_Revision = m_Screen->m_Revision;
if( m_TitleExport->IsChecked() ) if( m_TitleExport->IsChecked() )
screen->m_Title =m_Screen->m_Title; screen->m_Title = m_Screen->m_Title;
if( m_CompanyExport->IsChecked() ) if( m_CompanyExport->IsChecked() )
screen->m_Company = m_Screen->m_Company; screen->m_Company = m_Screen->m_Company;
...@@ -258,6 +257,7 @@ void DIALOG_PAGES_SETTINGS::SavePageSettings(wxCommandEvent& event) ...@@ -258,6 +257,7 @@ void DIALOG_PAGES_SETTINGS::SavePageSettings(wxCommandEvent& event)
if( m_Comment4Export->IsChecked() ) if( m_Comment4Export->IsChecked() )
screen->m_Commentaire4 = m_Screen->m_Commentaire4; screen->m_Commentaire4 = m_Screen->m_Commentaire4;
} }
#endif #endif
m_Screen->SetModify(); m_Screen->SetModify();
...@@ -265,14 +265,12 @@ void DIALOG_PAGES_SETTINGS::SavePageSettings(wxCommandEvent& event) ...@@ -265,14 +265,12 @@ void DIALOG_PAGES_SETTINGS::SavePageSettings(wxCommandEvent& event)
} }
/*******************************************************/
void DIALOG_PAGES_SETTINGS::SearchPageSizeSelection()
/*******************************************************/
/* Search the correct index to activate the radiobox list size selection /* Search the correct index to activate the radiobox list size selection
* according to the current page size * according to the current page size
*/ */
void DIALOG_PAGES_SETTINGS::SearchPageSizeSelection()
{ {
Ki_PageDescr * sheet; Ki_PageDescr* sheet;
int ii; int ii;
m_CurrentSelection = NB_ITEMS - 1; m_CurrentSelection = NB_ITEMS - 1;
......
common/dialogs/dialog_page_settings_base.fbp
View file @ 283cfa67
This source diff could not be displayed because it is too large. You can view the blob instead.
cvpcb/dialogs/dialog_cvpcb_config.cpp
View file @ 283cfa67
...@@ -32,10 +32,13 @@ DIALOG_CVPCB_CONFIG::DIALOG_CVPCB_CONFIG( CVPCB_MAINFRAME* parent ) : ...@@ -32,10 +32,13 @@ DIALOG_CVPCB_CONFIG::DIALOG_CVPCB_CONFIG( CVPCB_MAINFRAME* parent ) :
Init( ); Init( );
title = _( "Project file: " ) + fn.GetFullPath(); title = _( "Project file: " ) + fn.GetFullPath();
SetTitle( title ); SetTitle( title );
if( GetSizer() ) if( GetSizer() )
{ {
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
} }
m_sdbSizer2OK->SetDefault();
} }
......
eeschema/dialogs/dialog_eeschema_options_base.cpp
View file @ 283cfa67
...@@ -16,6 +16,7 @@ END_EVENT_TABLE() ...@@ -16,6 +16,7 @@ END_EVENT_TABLE()
DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{ {
this->SetSizeHints( wxDefaultSize, wxDefaultSize ); this->SetSizeHints( wxDefaultSize, wxDefaultSize );
this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
wxBoxSizer* mainSizer; wxBoxSizer* mainSizer;
mainSizer = new wxBoxSizer( wxVERTICAL ); mainSizer = new wxBoxSizer( wxVERTICAL );
...@@ -25,6 +26,8 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx ...@@ -25,6 +26,8 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
m_notebook1 = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_notebook1 = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
m_panel1 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panel1 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
m_panel1->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
wxBoxSizer* p1mainSizer; wxBoxSizer* p1mainSizer;
p1mainSizer = new wxBoxSizer( wxHORIZONTAL ); p1mainSizer = new wxBoxSizer( wxHORIZONTAL );
...@@ -148,8 +151,9 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx ...@@ -148,8 +151,9 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
m_panel1->SetSizer( p1mainSizer ); m_panel1->SetSizer( p1mainSizer );
m_panel1->Layout(); m_panel1->Layout();
p1mainSizer->Fit( m_panel1 ); p1mainSizer->Fit( m_panel1 );
m_notebook1->AddPage( m_panel1, _("General Options"), true ); m_notebook1->AddPage( m_panel1, _("General Options"), false );
m_panel2 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panel2 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
m_panel2->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
m_panel2->SetToolTip( _("User defined field names for schematic components. ") ); m_panel2->SetToolTip( _("User defined field names for schematic components. ") );
wxBoxSizer* bSizer6; wxBoxSizer* bSizer6;
...@@ -236,7 +240,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx ...@@ -236,7 +240,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
m_panel2->SetSizer( bSizer6 ); m_panel2->SetSizer( bSizer6 );
m_panel2->Layout(); m_panel2->Layout();
bSizer6->Fit( m_panel2 ); bSizer6->Fit( m_panel2 );
m_notebook1->AddPage( m_panel2, _("Template Field Names"), false ); m_notebook1->AddPage( m_panel2, _("Template Field Names"), true );
bOptionsSizer->Add( m_notebook1, 1, wxEXPAND, 0 ); bOptionsSizer->Add( m_notebook1, 1, wxEXPAND, 0 );
......
eeschema/dialogs/dialog_eeschema_options_base.fbp
View file @ 283cfa67
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<property name="use_enum">1</property> <property name="use_enum">1</property>
<property name="use_microsoft_bom">0</property> <property name="use_microsoft_bom">0</property>
<object class="Dialog" expanded="1"> <object class="Dialog" expanded="1">
<property name="bg"></property> <property name="bg">wxSYS_COLOUR_BTNFACE</property>
<property name="center">wxBOTH</property> <property name="center">wxBOTH</property>
<property name="context_help"></property> <property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
...@@ -151,9 +151,9 @@ ...@@ -151,9 +151,9 @@
<object class="notebookpage" expanded="1"> <object class="notebookpage" expanded="1">
<property name="bitmap"></property> <property name="bitmap"></property>
<property name="label">General Options</property> <property name="label">General Options</property>
<property name="select">1</property> <property name="select">0</property>
<object class="wxPanel" expanded="1"> <object class="wxPanel" expanded="1">
<property name="bg"></property> <property name="bg">wxSYS_COLOUR_BTNFACE</property>
<property name="context_help"></property> <property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
<property name="enabled">1</property> <property name="enabled">1</property>
...@@ -1649,9 +1649,9 @@ ...@@ -1649,9 +1649,9 @@
<object class="notebookpage" expanded="1"> <object class="notebookpage" expanded="1">
<property name="bitmap"></property> <property name="bitmap"></property>
<property name="label">Template Field Names</property> <property name="label">Template Field Names</property>
<property name="select">0</property> <property name="select">1</property>
<object class="wxPanel" expanded="1"> <object class="wxPanel" expanded="1">
<property name="bg"></property> <property name="bg">wxSYS_COLOUR_BTNFACE</property>
<property name="context_help"></property> <property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
<property name="enabled">1</property> <property name="enabled">1</property>
......
eeschema/dialogs/dialog_lib_edit_pin.cpp
View file @ 283cfa67
...@@ -8,46 +8,43 @@ DIALOG_LIB_EDIT_PIN::DIALOG_LIB_EDIT_PIN( wxWindow* parent ) : ...@@ -8,46 +8,43 @@ DIALOG_LIB_EDIT_PIN::DIALOG_LIB_EDIT_PIN( wxWindow* parent ) :
{ {
/* Required to make escape key work correctly in wxGTK. */ /* Required to make escape key work correctly in wxGTK. */
m_textName->SetFocus(); m_textName->SetFocus();
m_sdbSizer1OK->SetDefault();
} }
void DIALOG_LIB_EDIT_PIN::SetOrientationList( const wxArrayString& list, void DIALOG_LIB_EDIT_PIN::SetOrientationList( const wxArrayString& list,
const char *** aBitmaps ) const char*** aBitmaps )
{ {
for ( unsigned ii = 0; ii < list.GetCount( ); ii++ ) for ( unsigned ii = 0; ii < list.GetCount(); ii++ )
{ {
if( aBitmaps == NULL ) if( aBitmaps == NULL )
m_choiceOrientation->Append(list[ii]); m_choiceOrientation->Append( list[ii] );
else else
m_choiceOrientation->Insert(list[ii], m_choiceOrientation->Insert( list[ii], wxBitmap( aBitmaps[ii] ), ii );
wxBitmap(aBitmaps[ii]), ii);
} }
} }
void DIALOG_LIB_EDIT_PIN::SetElectricalTypeList( const wxArrayString& list, void DIALOG_LIB_EDIT_PIN::SetElectricalTypeList( const wxArrayString& list,
const char *** aBitmaps ) const char*** aBitmaps )
{ {
for ( unsigned ii = 0; ii < list.GetCount( ); ii++ ) for ( unsigned ii = 0; ii < list.GetCount(); ii++ )
{ {
if( aBitmaps == NULL ) if( aBitmaps == NULL )
m_choiceElectricalType->Append(list[ii]); m_choiceElectricalType->Append( list[ii] );
else else
m_choiceElectricalType->Insert(list[ii], m_choiceElectricalType->Insert( list[ii], wxBitmap( aBitmaps[ii] ), ii );
wxBitmap(aBitmaps[ii]), ii);
} }
} }
void DIALOG_LIB_EDIT_PIN::SetStyleList( const wxArrayString& list, void DIALOG_LIB_EDIT_PIN::SetStyleList( const wxArrayString& list, const char*** aBitmaps )
const char *** aBitmaps )
{ {
for ( unsigned ii = 0; ii < list.GetCount( ); ii++ ) for ( unsigned ii = 0; ii < list.GetCount(); ii++ )
{ {
if( aBitmaps == NULL ) if( aBitmaps == NULL )
m_choiceStyle->Append(list[ii]); m_choiceStyle->Append( list[ii] );
else else
m_choiceStyle->Insert(list[ii], m_choiceStyle->Insert( list[ii], wxBitmap( aBitmaps[ii] ), ii );
wxBitmap(aBitmaps[ii]), ii);
} }
} }
eeschema/dialogs/dialog_plot_schematic_DXF.cpp
View file @ 283cfa67
...@@ -90,6 +90,7 @@ DIALOG_PLOT_SCHEMATIC_DXF::DIALOG_PLOT_SCHEMATIC_DXF( SCH_EDIT_FRAME* parent ) ...@@ -90,6 +90,7 @@ DIALOG_PLOT_SCHEMATIC_DXF::DIALOG_PLOT_SCHEMATIC_DXF( SCH_EDIT_FRAME* parent )
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
Centre(); Centre();
m_buttonPlotAll->SetDefault();
} }
void DIALOG_PLOT_SCHEMATIC_DXF::initDlg() void DIALOG_PLOT_SCHEMATIC_DXF::initDlg()
......
eeschema/dialogs/dialog_plot_schematic_HPGL.cpp
View file @ 283cfa67
...@@ -125,6 +125,7 @@ DIALOG_PLOT_SCHEMATIC_HPGL::DIALOG_PLOT_SCHEMATIC_HPGL( SCH_EDIT_FRAME* parent ) ...@@ -125,6 +125,7 @@ DIALOG_PLOT_SCHEMATIC_HPGL::DIALOG_PLOT_SCHEMATIC_HPGL( SCH_EDIT_FRAME* parent )
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
Centre(); Centre();
m_buttonPlotAll->SetDefault();
} }
......
eeschema/dialogs/dialog_plot_schematic_PS.cpp
View file @ 283cfa67
...@@ -97,6 +97,7 @@ DIALOG_PLOT_SCHEMATIC_PS::DIALOG_PLOT_SCHEMATIC_PS( SCH_EDIT_FRAME* parent ) : ...@@ -97,6 +97,7 @@ DIALOG_PLOT_SCHEMATIC_PS::DIALOG_PLOT_SCHEMATIC_PS( SCH_EDIT_FRAME* parent ) :
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
Centre(); Centre();
m_buttonPlotAll->SetDefault();
} }
......
eeschema/dialogs/dialog_plot_schematic_PS_base.cpp
View file @ 283cfa67
...@@ -55,7 +55,7 @@ DIALOG_PLOT_SCHEMATIC_PS_BASE::DIALOG_PLOT_SCHEMATIC_PS_BASE( wxWindow* parent, ...@@ -55,7 +55,7 @@ DIALOG_PLOT_SCHEMATIC_PS_BASE::DIALOG_PLOT_SCHEMATIC_PS_BASE( wxWindow* parent,
m_buttonPlotAll = new wxButton( this, wxID_ANY, _("Plot A&LL"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonPlotAll = new wxButton( this, wxID_ANY, _("Plot A&LL"), wxDefaultPosition, wxDefaultSize, 0 );
bbuttonsSizer->Add( m_buttonPlotAll, 0, wxALL|wxEXPAND, 5 ); bbuttonsSizer->Add( m_buttonPlotAll, 0, wxALL|wxEXPAND, 5 );
m_buttonClose = new wxButton( this, wxID_ANY, _("Close"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonClose = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
bbuttonsSizer->Add( m_buttonClose, 0, wxALL|wxEXPAND, 5 ); bbuttonsSizer->Add( m_buttonClose, 0, wxALL|wxEXPAND, 5 );
bupperSizer->Add( bbuttonsSizer, 0, wxALIGN_CENTER_VERTICAL, 5 ); bupperSizer->Add( bbuttonsSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );
......
eeschema/dialogs/dialog_plot_schematic_PS_base.fbp
View file @ 283cfa67
...@@ -435,7 +435,7 @@ ...@@ -435,7 +435,7 @@
<property name="fg"></property> <property name="fg"></property>
<property name="font"></property> <property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_CANCEL</property>
<property name="label">Close</property> <property name="label">Close</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
......
eeschema/netlist_control.cpp
View file @ 283cfa67
This diff is collapsed.
eeschema/netlist_control.h
View file @ 283cfa67
...@@ -18,7 +18,8 @@ enum id_netlist { ...@@ -18,7 +18,8 @@ enum id_netlist {
ID_SETUP_PLUGIN, ID_SETUP_PLUGIN,
ID_VALIDATE_PLUGIN, ID_VALIDATE_PLUGIN,
ID_DELETE_PLUGIN, ID_DELETE_PLUGIN,
ID_NETLIST_NOTEBOOK ID_NETLIST_NOTEBOOK,
ID_CHANGE_NOTEBOOK_PAGE
}; };
/* panel (notebook page) identifiers */ /* panel (notebook page) identifiers */
......
gerbview/dialogs/dialog_print_using_printer.cpp
View file @ 283cfa67
...@@ -118,6 +118,8 @@ DIALOG_PRINT_USING_PRINTER::DIALOG_PRINT_USING_PRINTER( GERBVIEW_FRAME* parent ) ...@@ -118,6 +118,8 @@ DIALOG_PRINT_USING_PRINTER::DIALOG_PRINT_USING_PRINTER( GERBVIEW_FRAME* parent )
{ {
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
} }
m_buttonPrint->SetDefault();
} }
......
gerbview/dialogs/gerbview_dialog_display_options_frame.cpp
View file @ 283cfa67
...@@ -51,6 +51,7 @@ DIALOG_DISPLAY_OPTIONS::DIALOG_DISPLAY_OPTIONS( GERBVIEW_FRAME *parent) : ...@@ -51,6 +51,7 @@ DIALOG_DISPLAY_OPTIONS::DIALOG_DISPLAY_OPTIONS( GERBVIEW_FRAME *parent) :
GetSizer()->Fit( this ); GetSizer()->Fit( this );
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
Center(); Center();
m_sdbSizer1OK->SetDefault();
} }
......
include/param_config.h
View file @ 283cfa67
...@@ -159,13 +159,16 @@ public: ...@@ -159,13 +159,16 @@ public:
wxString* m_Pt_param; ///< Pointer to the parameter value wxString* m_Pt_param; ///< Pointer to the parameter value
wxString m_default; ///< The default value of the parameter wxString m_default; ///< The default value of the parameter
public: PARAM_CFG_WXSTRING( const wxChar* ident, wxString* ptparam, const wxChar* group = NULL ); public:
PARAM_CFG_WXSTRING( const wxChar* ident, wxString* ptparam, const wxChar* group = NULL );
PARAM_CFG_WXSTRING( bool Insetup, PARAM_CFG_WXSTRING( bool Insetup,
const wxChar* ident, const wxChar* ident,
wxString* ptparam, wxString* ptparam,
const wxString& default_val = wxEmptyString, const wxString& default_val = wxEmptyString,
const wxChar* group = NULL ); const wxChar* group = NULL );
virtual ~PARAM_CFG_WXSTRING() {}
virtual void ReadParam( wxConfigBase* aConfig ); virtual void ReadParam( wxConfigBase* aConfig );
virtual void SaveParam( wxConfigBase* aConfig ); virtual void SaveParam( wxConfigBase* aConfig );
}; };
......
pcbnew/dialogs/dialog_SVG_print.cpp
View file @ 283cfa67
...@@ -47,6 +47,7 @@ DIALOG_SVG_PRINT::DIALOG_SVG_PRINT( EDA_DRAW_FRAME* parent ) : ...@@ -47,6 +47,7 @@ DIALOG_SVG_PRINT::DIALOG_SVG_PRINT( EDA_DRAW_FRAME* parent ) :
initDialog( ); initDialog( );
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
Centre(); Centre();
m_buttonBoard->SetDefault();
} }
......
pcbnew/dialogs/dialog_cleaning_options.cpp
View file @ 283cfa67
...@@ -16,6 +16,7 @@ DIALOG_CLEANING_OPTIONS::DIALOG_CLEANING_OPTIONS( wxWindow* parent ): ...@@ -16,6 +16,7 @@ DIALOG_CLEANING_OPTIONS::DIALOG_CLEANING_OPTIONS( wxWindow* parent ):
m_deleteUnconnectedOpt->SetValue( deleteUnconnectedSegm ); m_deleteUnconnectedOpt->SetValue( deleteUnconnectedSegm );
m_reconnectToPadsOpt->SetValue( connectToPads ); m_reconnectToPadsOpt->SetValue( connectToPads );
m_sdbSizerOK->SetDefault();
GetSizer()->SetSizeHints(this); GetSizer()->SetSizeHints(this);
Centre(); Centre();
} }
......
pcbnew/dialogs/dialog_display_options.cpp
View file @ 283cfa67
...@@ -25,15 +25,14 @@ void PCB_EDIT_FRAME::InstallDisplayOptionsDialog( wxCommandEvent& aEvent ) ...@@ -25,15 +25,14 @@ void PCB_EDIT_FRAME::InstallDisplayOptionsDialog( wxCommandEvent& aEvent )
} }
/*******************************************************************************/
DIALOG_DISPLAY_OPTIONS::DIALOG_DISPLAY_OPTIONS( PCB_EDIT_FRAME* parent ) : DIALOG_DISPLAY_OPTIONS::DIALOG_DISPLAY_OPTIONS( PCB_EDIT_FRAME* parent ) :
DIALOG_DISPLAY_OPTIONS_BASE(parent) DIALOG_DISPLAY_OPTIONS_BASE( parent )
/*******************************************************************************/
{ {
m_Parent = parent; m_Parent = parent;
init(); init();
m_buttonOK->SetDefault();
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
} }
......
pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
View file @ 283cfa67
...@@ -30,6 +30,7 @@ DIALOG_MODULE_BOARD_EDITOR::DIALOG_MODULE_BOARD_EDITOR( PCB_EDIT_FRAME* aParent ...@@ -30,6 +30,7 @@ DIALOG_MODULE_BOARD_EDITOR::DIALOG_MODULE_BOARD_EDITOR( PCB_EDIT_FRAME* aParent
InitModeditProperties(); InitModeditProperties();
InitBoardProperties(); InitBoardProperties();
m_sdbSizerStdButtonsOK->SetDefault();
GetSizer()->Fit( this ); GetSizer()->Fit( this );
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
Centre(); Centre();
......
pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
View file @ 283cfa67
...@@ -16,16 +16,16 @@ ...@@ -16,16 +16,16 @@
#include "module_editor_frame.h" #include "module_editor_frame.h"
#include "dialog_edit_module_for_Modedit.h" #include "dialog_edit_module_for_Modedit.h"
/**************************************************************************************/
DIALOG_MODULE_MODULE_EDITOR::DIALOG_MODULE_MODULE_EDITOR( WinEDA_ModuleEditFrame* aParent, DIALOG_MODULE_MODULE_EDITOR::DIALOG_MODULE_MODULE_EDITOR( WinEDA_ModuleEditFrame* aParent,
MODULE* aModule ) : MODULE* aModule ) :
DIALOG_MODULE_MODULE_EDITOR_BASE( aParent ) DIALOG_MODULE_MODULE_EDITOR_BASE( aParent )
/**************************************************************************************/
{ {
m_Parent = aParent; m_Parent = aParent;
m_CurrentModule = aModule; m_CurrentModule = aModule;
SetIcon( wxICON( icon_modedit ) ); // Give an icon SetIcon( wxICON( icon_modedit ) ); // Give an icon
InitModeditProperties(); InitModeditProperties();
m_sdbSizerStdButtonsOK->SetDefault();
GetSizer()->Fit( this ); GetSizer()->Fit( this );
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
Centre(); Centre();
......
pcbnew/dialogs/dialog_edit_module_text.cpp
View file @ 283cfa67
...@@ -58,10 +58,13 @@ DialogEditModuleText::DialogEditModuleText( PCB_BASE_FRAME* parent, ...@@ -58,10 +58,13 @@ DialogEditModuleText::DialogEditModuleText( PCB_BASE_FRAME* parent,
m_DC = DC; m_DC = DC;
m_Module = NULL; m_Module = NULL;
m_CurrentTextMod = TextMod; m_CurrentTextMod = TextMod;
if( m_CurrentTextMod ) if( m_CurrentTextMod )
m_Module = (MODULE*) m_CurrentTextMod->GetParent(); m_Module = (MODULE*) m_CurrentTextMod->GetParent();
Init( ); Init( );
m_buttonOK->SetDefault();
GetSizer()->Fit( this ); GetSizer()->Fit( this );
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
} }
......
pcbnew/dialogs/dialog_freeroute_exchange.cpp
View file @ 283cfa67
...@@ -37,6 +37,7 @@ DIALOG_FREEROUTE::DIALOG_FREEROUTE( PCB_EDIT_FRAME* parent ): ...@@ -37,6 +37,7 @@ DIALOG_FREEROUTE::DIALOG_FREEROUTE( PCB_EDIT_FRAME* parent ):
m_Parent = parent; m_Parent = parent;
MyInit(); MyInit();
m_sdbSizer1OK->SetDefault();
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
Centre(); Centre();
} }
......
pcbnew/dialogs/dialog_general_options.cpp
View file @ 283cfa67
...@@ -25,6 +25,7 @@ Dialog_GeneralOptions::Dialog_GeneralOptions( PCB_EDIT_FRAME* parent ) : ...@@ -25,6 +25,7 @@ Dialog_GeneralOptions::Dialog_GeneralOptions( PCB_EDIT_FRAME* parent ) :
m_Parent = parent; m_Parent = parent;
init(); init();
m_buttonOK->SetDefault();
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
Center(); Center();
} }
......
pcbnew/dialogs/dialog_graphic_items_options.cpp
View file @ 283cfa67
...@@ -43,6 +43,7 @@ DIALOG_GRAPHIC_ITEMS_OPTIONS::DIALOG_GRAPHIC_ITEMS_OPTIONS( PCB_BASE_FRAME* pare ...@@ -43,6 +43,7 @@ DIALOG_GRAPHIC_ITEMS_OPTIONS::DIALOG_GRAPHIC_ITEMS_OPTIONS( PCB_BASE_FRAME* pare
m_BrdSettings = m_Parent->GetBoard()->GetBoardDesignSettings(); m_BrdSettings = m_Parent->GetBoard()->GetBoardDesignSettings();
initValues( ); initValues( );
m_sdbSizer1OK->SetDefault();
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
Centre(); Centre();
......
pcbnew/dialogs/dialog_mask_clearance.cpp
View file @ 283cfa67
...@@ -29,6 +29,7 @@ DIALOG_PADS_MASK_CLEARANCE::DIALOG_PADS_MASK_CLEARANCE( PCB_EDIT_FRAME* parent ) ...@@ -29,6 +29,7 @@ DIALOG_PADS_MASK_CLEARANCE::DIALOG_PADS_MASK_CLEARANCE( PCB_EDIT_FRAME* parent )
m_BrdSettings = m_Parent->GetBoard()->GetBoardDesignSettings(); m_BrdSettings = m_Parent->GetBoard()->GetBoardDesignSettings();
MyInit(); MyInit();
m_sdbButtonsSizerOK->SetDefault();
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
Centre(); Centre();
} }
......
pcbnew/dialogs/dialog_pad_properties.cpp
View file @ 283cfa67
...@@ -157,6 +157,7 @@ DIALOG_PAD_PROPERTIES::DIALOG_PAD_PROPERTIES( PCB_BASE_FRAME* parent, D_PAD* Pad ...@@ -157,6 +157,7 @@ DIALOG_PAD_PROPERTIES::DIALOG_PAD_PROPERTIES( PCB_BASE_FRAME* parent, D_PAD* Pad
initValues(); initValues();
m_sdbSizer1OK->SetDefault();
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
Center(); Center();
m_canUpdate = true; m_canUpdate = true;
......
pcbnew/dialogs/dialog_pcb_text_properties.cpp
View file @ 283cfa67
...@@ -53,6 +53,7 @@ DIALOG_PCB_TEXT_PROPERTIES::DIALOG_PCB_TEXT_PROPERTIES( PCB_EDIT_FRAME* parent, ...@@ -53,6 +53,7 @@ DIALOG_PCB_TEXT_PROPERTIES::DIALOG_PCB_TEXT_PROPERTIES( PCB_EDIT_FRAME* parent,
m_SelectedPCBText = passedTextPCB; m_SelectedPCBText = passedTextPCB;
MyInit(); MyInit();
m_StandardSizerOK->SetDefault();
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
Centre(); Centre();
} }
......
pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths.cpp
View file @ 283cfa67
...@@ -40,9 +40,10 @@ DIALOG_PCBNEW_CONFIG_LIBS::DIALOG_PCBNEW_CONFIG_LIBS( PCB_EDIT_FRAME* parent ): ...@@ -40,9 +40,10 @@ DIALOG_PCBNEW_CONFIG_LIBS::DIALOG_PCBNEW_CONFIG_LIBS( PCB_EDIT_FRAME* parent ):
wxString title = _( "from " ) + wxGetApp().m_CurrentOptionFile; wxString title = _( "from " ) + wxGetApp().m_CurrentOptionFile;
SetTitle( title ); SetTitle( title );
m_sdbSizer1OK->SetDefault();
if( GetSizer() ) if( GetSizer() )
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
} }
/*************************************/ /*************************************/
......
pcbnew/dialogs/dialog_print_for_modedit.cpp
View file @ 283cfa67
...@@ -89,6 +89,7 @@ DIALOG_PRINT_FOR_MODEDIT::DIALOG_PRINT_FOR_MODEDIT( EDA_DRAW_FRAME* parent ) : ...@@ -89,6 +89,7 @@ DIALOG_PRINT_FOR_MODEDIT::DIALOG_PRINT_FOR_MODEDIT( EDA_DRAW_FRAME* parent ) :
m_Config = wxGetApp().m_EDA_Config; m_Config = wxGetApp().m_EDA_Config;
InitValues(); InitValues();
m_buttonPrint->SetDefault();
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
Center(); Center();
} }
......
pcbnew/sel_layer.cpp
View file @ 283cfa67
...@@ -258,20 +258,23 @@ WinEDA_SelLayerPairFrame::WinEDA_SelLayerPairFrame( PCB_BASE_FRAME* parent ) : ...@@ -258,20 +258,23 @@ WinEDA_SelLayerPairFrame::WinEDA_SelLayerPairFrame( PCB_BASE_FRAME* parent ) :
m_Parent = parent; m_Parent = parent;
PCB_SCREEN* screen = (PCB_SCREEN*) m_Parent->GetScreen(); PCB_SCREEN* screen = (PCB_SCREEN*) m_Parent->GetScreen();
int Masque_Layer = int Masque_Layer = g_TabAllCopperLayerMask[board->GetCopperLayerCount() - 1];
g_TabAllCopperLayerMask[board->GetCopperLayerCount() - 1];
Masque_Layer += ALL_NO_CU_LAYERS; Masque_Layer += ALL_NO_CU_LAYERS;
for( ii = 0, LayerCount = 0; ii < NB_COPPER_LAYERS; ii++ ) for( ii = 0, LayerCount = 0; ii < NB_COPPER_LAYERS; ii++ )
{ {
m_LayerId[ii] = 0; m_LayerId[ii] = 0;
if( (g_TabOneLayerMask[ii] & Masque_Layer) ) if( (g_TabOneLayerMask[ii] & Masque_Layer) )
{ {
LayerList[LayerCount] = board->GetLayerName( ii ); LayerList[LayerCount] = board->GetLayerName( ii );
if( ii == screen->m_Route_Layer_TOP ) if( ii == screen->m_Route_Layer_TOP )
LayerTopSelect = LayerCount; LayerTopSelect = LayerCount;
if( ii == screen->m_Route_Layer_BOTTOM ) if( ii == screen->m_Route_Layer_BOTTOM )
LayerBottomSelect = LayerCount; LayerBottomSelect = LayerCount;
m_LayerId[LayerCount] = ii; m_LayerId[LayerCount] = ii;
LayerCount++; LayerCount++;
} }
...@@ -306,6 +309,7 @@ WinEDA_SelLayerPairFrame::WinEDA_SelLayerPairFrame( PCB_BASE_FRAME* parent ) : ...@@ -306,6 +309,7 @@ WinEDA_SelLayerPairFrame::WinEDA_SelLayerPairFrame( PCB_BASE_FRAME* parent ) :
RadioBoxSizer->Add( m_LayerListBOTTOM, 0, wxALIGN_TOP | wxALL, 5 ); RadioBoxSizer->Add( m_LayerListBOTTOM, 0, wxALIGN_TOP | wxALL, 5 );
Button = new wxButton( this, wxID_OK, _( "OK" ) ); Button = new wxButton( this, wxID_OK, _( "OK" ) );
Button->SetDefault();
ButtonBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 ); ButtonBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) ); Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
...@@ -323,16 +327,14 @@ void WinEDA_SelLayerPairFrame::OnOkClick( wxCommandEvent& event ) ...@@ -323,16 +327,14 @@ void WinEDA_SelLayerPairFrame::OnOkClick( wxCommandEvent& event )
// select the same layer for top and bottom is allowed (normal in some // select the same layer for top and bottom is allowed (normal in some
// boards) // boards)
// but could be a mistake. So display an info message // but could be a mistake. So display an info message
if( m_LayerId[m_LayerListTOP->GetSelection()] if( m_LayerId[m_LayerListTOP->GetSelection()] == m_LayerId[m_LayerListBOTTOM->GetSelection()] )
== m_LayerId[m_LayerListBOTTOM->GetSelection()] )
DisplayInfoMessage( this, DisplayInfoMessage( this,
_( "Warning: The Top Layer and Bottom Layer are same." ) ); _( "Warning: The Top Layer and Bottom Layer are same." ) );
PCB_SCREEN* screen = (PCB_SCREEN*) m_Parent->GetScreen(); PCB_SCREEN* screen = (PCB_SCREEN*) m_Parent->GetScreen();
screen->m_Route_Layer_TOP = m_LayerId[m_LayerListTOP->GetSelection()]; screen->m_Route_Layer_TOP = m_LayerId[m_LayerListTOP->GetSelection()];
screen->m_Route_Layer_BOTTOM = screen->m_Route_Layer_BOTTOM = m_LayerId[m_LayerListBOTTOM->GetSelection()];
m_LayerId[m_LayerListBOTTOM->GetSelection()];
EndModal( 0 ); EndModal( 0 );
} }
......
pcbnew/set_grid.cpp
View file @ 283cfa67
...@@ -70,6 +70,7 @@ DIALOG_SET_GRID::DIALOG_SET_GRID( wxWindow* parent, const wxPoint& pos ) : ...@@ -70,6 +70,7 @@ DIALOG_SET_GRID::DIALOG_SET_GRID( wxWindow* parent, const wxPoint& pos ) :
m_TextPosXUnits->SetLabel( GetUnitsLabel( g_UserUnit ) ); m_TextPosXUnits->SetLabel( GetUnitsLabel( g_UserUnit ) );
m_TextPosYUnits->SetLabel( GetUnitsLabel( g_UserUnit ) ); m_TextPosYUnits->SetLabel( GetUnitsLabel( g_UserUnit ) );
m_sdbSizer1OK->SetDefault();
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
Centre(); Centre();
} }
......
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