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

More PocketPC adaptations

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-03-14 16:37:02 +00:00
parent 905372991f
commit e5c990b3a6
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
demos/life/dialogs.cpp
View File

@@ -170,8 +170,7 @@ LifeAboutDialog::LifeAboutDialog(wxWindow *parent)
wxDefaultPosition, wxDefaultSize) wxDefaultPosition, wxDefaultSize)
{ {
// logo // logo
wxBitmap bmp(life_xpm); wxStaticBitmap *sbmp = new wxStaticBitmap(this, wxID_ANY, wxBitmap(life_xpm));
wxStaticBitmap *sbmp = new wxStaticBitmap(this, wxID_ANY, bmp);
// layout components // layout components
wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
@@ -188,12 +187,15 @@ XLife is (c) 1989 by Jon Bennett et al.")),
#if wxUSE_STATLINE #if wxUSE_STATLINE
sizer->Add( new wxStaticLine(this, wxID_ANY), 0, wxGROW | wxLEFT | wxRIGHT, 5 ); sizer->Add( new wxStaticLine(this, wxID_ANY), 0, wxGROW | wxLEFT | wxRIGHT, 5 );
#endif // wxUSE_STATLINE #endif // wxUSE_STATLINE
#ifndef __WXWINCE__
sizer->Add( CreateButtonSizer(wxOK), 0, wxCENTRE | wxALL, 10 ); sizer->Add( CreateButtonSizer(wxOK), 0, wxCENTRE | wxALL, 10 );
#endif
// activate // activate
SetSizer(sizer); SetSizer(sizer);
#if defined(__POCKETPC__) || defined(__SMARTPHONE__) #ifdef __WXWINCE__
Layout(); Layout();
#else #else
sizer->SetSizeHints(this); sizer->SetSizeHints(this);

17
demos/life/life.cpp
View File

@@ -183,8 +183,9 @@ bool LifeApp::OnInit()
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// frame constructor // frame constructor
LifeFrame::LifeFrame() : wxFrame( (wxFrame *) NULL, wxID_ANY, LifeFrame::LifeFrame() :
_("Life!"), wxDefaultPosition ) wxFrame( (wxFrame *) NULL, wxID_ANY, _("Life!"), wxDefaultPosition ),
m_navigator(NULL)
{ {
// frame icon // frame icon
SetIcon(wxICON(mondrian)); SetIcon(wxICON(mondrian));
@@ -198,12 +199,15 @@ LifeFrame::LifeFrame() : wxFrame( (wxFrame *) NULL, wxID_ANY,
menuFile->Append(wxID_NEW, wxGetStockLabel(wxID_NEW), _("Start a new game")); menuFile->Append(wxID_NEW, wxGetStockLabel(wxID_NEW), _("Start a new game"));
menuFile->Append(wxID_OPEN, wxGetStockLabel(wxID_OPEN), _("Open an existing Life pattern")); menuFile->Append(wxID_OPEN, wxGetStockLabel(wxID_OPEN), _("Open an existing Life pattern"));
menuFile->Append(ID_SAMPLES, _("&Sample game..."), _("Select a sample configuration")); menuFile->Append(ID_SAMPLES, _("&Sample game..."), _("Select a sample configuration"));
#ifndef __WXWINCE__
menuFile->AppendSeparator(); menuFile->AppendSeparator();
menuFile->Append(wxID_EXIT, wxGetStockLabel(wxID_EXIT, true, _T("Alt-X")), _("Quit this program")); menuFile->Append(wxID_EXIT, wxGetStockLabel(wxID_EXIT, true, _T("Alt-X")), _("Quit this program"));
menuView->Append(ID_SHOWNAV, _("Navigation &toolbox"), _("Show or hide toolbox"), wxITEM_CHECK); menuView->Append(ID_SHOWNAV, _("Navigation &toolbox"), _("Show or hide toolbox"), wxITEM_CHECK);
menuView->Check(ID_SHOWNAV, true); menuView->Check(ID_SHOWNAV, true);
menuView->AppendSeparator(); menuView->AppendSeparator();
#endif
menuView->Append(ID_ORIGIN, _("&Absolute origin"), _("Go to (0, 0)")); menuView->Append(ID_ORIGIN, _("&Absolute origin"), _("Go to (0, 0)"));
menuView->Append(ID_CENTER, _("&Center of mass"), _("Find center of mass")); menuView->Append(ID_CENTER, _("&Center of mass"), _("Find center of mass"));
menuView->Append(ID_NORTH, _("&North"), _("Find northernmost cell")); menuView->Append(ID_NORTH, _("&North"), _("Find northernmost cell"));
@@ -327,15 +331,17 @@ LifeFrame::LifeFrame() : wxFrame( (wxFrame *) NULL, wxID_ANY,
sizer3->Add( panel1, 1, wxGROW ); sizer3->Add( panel1, 1, wxGROW );
sizer3->Add( panel2, 0, wxGROW ); sizer3->Add( panel2, 0, wxGROW );
SetSizer( sizer3 ); SetSizer( sizer3 );
#ifndef __WXWINCE__ #ifndef __WXWINCE__
sizer3->Fit( this ); sizer3->Fit( this );
// set minimum frame size // set minimum frame size
sizer3->SetSizeHints( this ); sizer3->SetSizeHints( this );
// navigator frame - not appropriate for small devices
m_navigator = new LifeNavigator(this);
#endif #endif
// navigator frame
m_navigator = new LifeNavigator(this);
} }
LifeFrame::~LifeFrame() LifeFrame::~LifeFrame()
@@ -407,7 +413,8 @@ void LifeFrame::OnMenu(wxCommandEvent& event)
case ID_SHOWNAV: case ID_SHOWNAV:
{ {
bool checked = GetMenuBar()->GetMenu(1)->IsChecked(ID_SHOWNAV); bool checked = GetMenuBar()->GetMenu(1)->IsChecked(ID_SHOWNAV);
m_navigator->Show(checked); if (m_navigator)
m_navigator->Show(checked);
break; break;
} }
case ID_INFO: case ID_INFO: