X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5f7bcb48fd9a642036a3bf5c70e2b0c9576df1b1..9cc62fc819e1b2b01af9732a3ad218aeec13e4d4:/src/generic/tipdlg.cpp?ds=sidebyside

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index bd27ad9313..3c014cab9c 100644
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -60,7 +60,7 @@ static const int wxID_NEXT_TIP = 32000;  // whatever
 // ---------------------------------------------------------------------------
 
 /* 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__)
@@ -211,6 +211,7 @@ wxString wxFileTipProvider::GetTip()
 
 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,
@@ -224,14 +225,15 @@ 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__
-    // FIXME: use stock wxID_CLOSE button here!
-    wxButton *btnClose = new wxButton(this, wxID_CANCEL, _("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
@@ -288,7 +290,11 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
     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) );
@@ -304,12 +310,6 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
     topsizer->Fit( this );
 
     Centre(wxBOTH | wxCENTER_FRAME);
-
-#ifdef __SMARTPHONE__
-    SetRightMenu(wxID_NEXT_TIP, _("Next"));
-    SetLeftMenu(wxID_CANCEL, _("Close"));
-#endif
-
 }
 
 // ----------------------------------------------------------------------------