haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DIALOG_MULTI_OPTIONS: fixed disappearing buttons

This commit is contained in:
Maciej Suminski 2017-11-21 23:01:00 +01:00
parent 28608b1b52
commit d16e4e23d7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/confirm.cpp
View File

@ -182,7 +182,7 @@ int YesNoCancelDialog( wxWindow* aParent,
int SelectSingleOption( wxWindow* aParent, const wxString& aTitle, const wxString& aMessage, const wxArrayString& aOptions ) int SelectSingleOption( wxWindow* aParent, const wxString& aTitle, const wxString& aMessage, const wxArrayString& aOptions )
{ {
int ret = -1; int ret = -1;
wxDialog* dlg = new DIALOG_SHIM( aParent, wxID_ANY, aTitle ); wxDialog* dlg = new wxDialog( aParent, wxID_ANY, aTitle );
wxBoxSizer* boxSizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer* boxSizer = new wxBoxSizer( wxVERTICAL );
@ -232,12 +232,12 @@ int SelectSingleOption( wxWindow* aParent, const wxString& aTitle, const wxStrin
} }
class DIALOG_MULTI_OPTIONS : public DIALOG_SHIM class DIALOG_MULTI_OPTIONS : public wxDialog
{ {
public: public:
DIALOG_MULTI_OPTIONS( wxWindow* aParent, const wxString& aTitle, const wxString& aMessage, DIALOG_MULTI_OPTIONS( wxWindow* aParent, const wxString& aTitle, const wxString& aMessage,
const wxArrayString& aOptions ) const wxArrayString& aOptions )
: DIALOG_SHIM( aParent, wxID_ANY, aTitle ) : wxDialog( aParent, wxID_ANY, aTitle )
{ {
SetSizeHints( wxDefaultSize, wxDefaultSize ); SetSizeHints( wxDefaultSize, wxDefaultSize );
@ -251,13 +251,13 @@ public:
for( const wxString& option : aOptions ) for( const wxString& option : aOptions )
m_checklist->Append( option ); m_checklist->Append( option );
boxSizer->Add( m_checklist, 0, wxEXPAND | wxALL, 5 ); boxSizer->Add( m_checklist, 1, wxEXPAND | wxALL, 5 );
wxBoxSizer* btnSizer = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer* btnSizer = new wxBoxSizer( wxHORIZONTAL );
wxButton* selectAll = new wxButton( this, wxID_ANY, _( "Select All" ) ); wxButton* selectAll = new wxButton( this, wxID_ANY, _( "Select All" ) );
btnSizer->Add( selectAll, 0, wxEXPAND | wxALL, 5 ); btnSizer->Add( selectAll, 1, wxEXPAND | wxALL, 5 );
wxButton* unselectAll = new wxButton( this, wxID_ANY, _( "Unselect All" ) ); wxButton* unselectAll = new wxButton( this, wxID_ANY, _( "Unselect All" ) );
btnSizer->Add( unselectAll, 0, wxEXPAND | wxALL, 5 ); btnSizer->Add( unselectAll, 1, wxEXPAND | wxALL, 5 );
boxSizer->Add( btnSizer, 0, wxEXPAND | wxALL, 5 ); boxSizer->Add( btnSizer, 0, wxEXPAND | wxALL, 5 );
wxStdDialogButtonSizer* m_sdboxSizer = new wxStdDialogButtonSizer(); wxStdDialogButtonSizer* m_sdboxSizer = new wxStdDialogButtonSizer();