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

More common code moved from generic dialogs to wxDialogBase::CreateButtonSizer(). New system option 'wince.dialog.real-ok-cancel'.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-01-15 10:06:15 +00:00
parent f3078f075b
commit 897b24cf5c
10 changed files with 184 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
demos/life/dialogs.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: dialogs.cpp
// Name: life/dialogs.cpp
// Purpose: Life! dialogs
// Author: Guillermo Rodriguez Garcia, <guille@iies.es>
// Modified by:
@@ -86,7 +86,7 @@ LifeSamplesDialog::LifeSamplesDialog(wxWindow *parent)
if (isPDA &&
wxSystemSettings::GetMetric(wxSYS_SCREEN_X) < wxSystemSettings::GetMetric(wxSYS_SCREEN_Y))
{
listSize = wxSize(-1, 50);
listSize = wxSize(wxDefaultCoord, 50);
screenIsHorizontal = false;
}
@@ -128,21 +128,21 @@ LifeSamplesDialog::LifeSamplesDialog(wxWindow *parent)
sizer3->Add( new wxStaticLine(this, wxID_ANY), 0, wxGROW | wxLEFT | wxRIGHT, 10 );
#endif // wxUSE_STATLINE
sizer3->Add( sizer2, 1, wxGROW | wxALL, 5 );
#if wxUSE_STATLINE
if (!isPDA)
sizer3->Add( new wxStaticLine(this, wxID_ANY), 0, wxGROW | wxLEFT | wxRIGHT, 10 );
#endif // wxUSE_STATLINE
#if defined(__SMARTPHONE__)
SetLeftMenu(wxID_CANCEL);
SetRightMenu(wxID_OK);
#endif
wxSizer *buttonSizer = CreateButtonSizer( wxOK|wxCANCEL , true, 10 );
if(buttonSizer->GetChildren().GetCount() > 0 )
{
sizer3->Add( buttonSizer, 0, wxEXPAND | wxALL, 10 );
}
else
{
sizer3->AddSpacer( 10 );
delete buttonSizer;
}
// activate
SetSizer(sizer3);
#if !defined(__POCKETPC__) && !defined(__SMARTPHONE__)
sizer3->Add( CreateButtonSizer(wxOK | wxCANCEL), 0, wxCENTRE | wxALL, isPDA ? 2 : 10 );
#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
sizer3->SetSizeHints(this);
sizer3->Fit(this);
Centre(wxBOTH | wxCENTRE_ON_SCREEN);
@@ -199,24 +199,25 @@ LifeAboutDialog::LifeAboutDialog(wxWindow *parent)
<guille@iies.es>\n\n\
Portions of the code are based in XLife;\n\
XLife is (c) 1989 by Jon Bennett et al.")),
0, wxCENTRE | wxALL, 20 );
#if wxUSE_STATLINE
sizer->Add( new wxStaticLine(this, wxID_ANY), 0, wxGROW | wxLEFT | wxRIGHT, 5 );
#endif // wxUSE_STATLINE
0, wxCENTRE | wxRIGHT|wxLEFT|wxTOP, 20 );
#if ! (defined(__SMARTPHONE__) || defined(__POCKETPC__))
sizer->Add( CreateButtonSizer(wxOK), 0, wxCENTRE | wxALL, 10 );
#endif
// buttons if any
wxSizer *buttonSizer = CreateButtonSizer( wxOK , true, 10 );
if(buttonSizer->GetChildren().GetCount() > 0 )
{
sizer->Add( buttonSizer, 0, wxEXPAND | wxALL, 10 );
}
else
{
sizer->AddSpacer( 20 );
delete buttonSizer;
}
// activate
SetSizer(sizer);
#if ! (defined(__SMARTPHONE__) || defined(__POCKETPC__))
#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
sizer->SetSizeHints(this);
sizer->Fit(this);
Centre(wxBOTH | wxCENTRE_ON_SCREEN);
#endif
}