Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxStdDialogButtonSizer in editor dialogs of wxLongStringProperty and wxArrayStringProperty

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2009-04-18 09:43:18 +00:00
parent a51fdf81b9
commit 29d50f3e8f
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/propgrid/props.cpp
View File

@@ -1949,14 +1949,14 @@ bool wxLongStringProperty::DisplayEditorDialog( wxPGProperty* prop, wxPropertyGr
rowsizer->Add( ed, 1, wxEXPAND|wxALL, spacing ); rowsizer->Add( ed, 1, wxEXPAND|wxALL, spacing );
topsizer->Add( rowsizer, 1, wxEXPAND, 0 ); topsizer->Add( rowsizer, 1, wxEXPAND, 0 );
rowsizer = new wxBoxSizer( wxHORIZONTAL );
const int but_sz_flags = wxStdDialogButtonSizer* buttonSizer = new wxStdDialogButtonSizer();
wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT; buttonSizer->AddButton(new wxButton(dlg, wxID_OK));
rowsizer->Add( new wxButton(dlg,wxID_OK,_("Ok")), buttonSizer->AddButton(new wxButton(dlg, wxID_CANCEL));
0, but_sz_flags, spacing ); buttonSizer->Realize();
rowsizer->Add( new wxButton(dlg,wxID_CANCEL,_("Cancel")), topsizer->Add( buttonSizer, 0,
0, but_sz_flags, spacing ); wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL|wxBOTTOM|wxRIGHT,
topsizer->Add( rowsizer, 0, wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL, 0 ); spacing );
dlg->SetSizer( topsizer ); dlg->SetSizer( topsizer );
topsizer->SetSizeHints( dlg ); topsizer->SetSizeHints( dlg );
@@ -2111,9 +2111,6 @@ bool wxArrayEditorDialog::Create( wxWindow *parent,
m_curFocus = 1; m_curFocus = 1;
const int but_sz_flags =
wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL|wxALL; //wxBOTTOM|wxLEFT|wxRIGHT;
wxBoxSizer* topsizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer* topsizer = new wxBoxSizer( wxVERTICAL );
// Message // Message
@@ -2183,17 +2180,14 @@ bool wxArrayEditorDialog::Create( wxWindow *parent,
topsizer->Add( new wxStaticLine(this,-1), topsizer->Add( new wxStaticLine(this,-1),
0, wxEXPAND|wxTOP|wxLEFT|wxRIGHT, spacing ); 0, wxEXPAND|wxTOP|wxLEFT|wxRIGHT, spacing );
// buttons // Standard dialog buttons
rowsizer = new wxBoxSizer( wxHORIZONTAL ); wxStdDialogButtonSizer* buttonSizer = new wxStdDialogButtonSizer();
/* buttonSizer->AddButton(new wxButton(this, wxID_OK));
const int but_sz_flags = buttonSizer->AddButton(new wxButton(this, wxID_CANCEL));
wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT; buttonSizer->Realize();
*/ topsizer->Add( buttonSizer, 0,
rowsizer->Add( new wxButton(this,wxID_OK,_("Ok")), wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL|wxALL,
0, but_sz_flags, spacing ); spacing );
rowsizer->Add( new wxButton(this,wxID_CANCEL,_("Cancel")),
0, but_sz_flags, spacing );
topsizer->Add( rowsizer, 0, wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL, 0 );
m_edValue->SetFocus(); m_edValue->SetFocus();