// ---------------------------------------------------------------------------
/* Macro for avoiding #ifdefs when value have to be different depending on size of
- device we display on
+ device we display on - take it from something like wxDesktopPolicy in the future
*/
#if defined(__SMARTPHONE__)
BEGIN_EVENT_TABLE(wxTipDialog, wxDialog)
EVT_BUTTON(wxID_NEXT_TIP, wxTipDialog::OnNextTip)
+ EVT_BUTTON(wxID_CLOSE, wxTipDialog::OnCancel)
END_EVENT_TABLE()
wxTipDialog::wxTipDialog(wxWindow *parent,
// 1) create all controls in tab order
+ // smart phones does not support or do not waste space for wxButtons
#ifndef __SMARTPHONE__
- wxButton *btnClose = new wxButton(this, wxID_CANCEL, wxSTOCK_CLOSE);
+ wxButton *btnClose = new wxButton(this, wxID_CLOSE);
#endif
m_checkbox = new wxCheckBox(this, wxID_ANY, _("&Show tips at startup"));
m_checkbox->SetValue(showAtStartup);
+ // smart phones does not support or do not waste space for wxButtons
#ifndef __SMARTPHONE__
wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next Tip"));
#endif
wxBoxSizer *bottom = new wxBoxSizer( wxHORIZONTAL );
bottom->Add( m_checkbox, 0, wxCENTER );
-#ifndef __SMARTPHONE__
+ // smart phones does not support or do not waste space for wxButtons
+#ifdef __SMARTPHONE__
+ SetRightMenu(wxID_NEXT_TIP, _("Next"));
+ SetLeftMenu(wxID_CLOSE);
+#else
bottom->Add( 10,10,1 );
bottom->Add( btnNext, 0, wxCENTER | wxLEFT, wxLARGESMALL(10,0) );
bottom->Add( btnClose, 0, wxCENTER | wxLEFT, wxLARGESMALL(10,0) );
topsizer->Fit( this );
Centre(wxBOTH | wxCENTER_FRAME);
-
-#ifdef __SMARTPHONE__
- SetRightMenu(wxID_NEXT_TIP, _("Next"));
- SetLeftMenu(wxID_CANCEL, _("Close"));
-#endif
-
}
// ----------------------------------------------------------------------------