X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e225b106d97e8d99110b4646b151695f8dcf518f..e854ed477efa1efdb17d2c9ae74d11b2c5e111e9:/src/generic/tipdlg.cpp?ds=sidebyside

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 603f7881a9..a3514774fd 100644
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "tipdlg.h"
 #endif
 
@@ -53,7 +53,21 @@
 // constants
 // ----------------------------------------------------------------------------
 
-static const int wxID_NEXT_TIP = -100;  // whatever
+static const int wxID_NEXT_TIP = 32000;  // whatever
+
+// ---------------------------------------------------------------------------
+// macros
+// ---------------------------------------------------------------------------
+
+/* Macro for avoiding #ifdefs when value have to be different depending on size of
+   device we display on - take it from something like wxDesktopPolicy in the future
+ */
+
+#if defined(__SMARTPHONE__)
+    #define wxLARGESMALL(large,small) small
+#else
+    #define wxLARGESMALL(large,small) large
+#endif
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -61,7 +75,7 @@ static const int wxID_NEXT_TIP = -100;  // whatever
 
 // an implementation which takes the tips from the text file - each line
 // represents a tip
-class WXDLLEXPORT wxFileTipProvider : public wxTipProvider
+class WXDLLIMPEXP_ADV wxFileTipProvider : public wxTipProvider
 {
 public:
     wxFileTipProvider(const wxString& filename, size_t currentTip);
@@ -70,11 +84,13 @@ public:
 
 private:
     wxTextFile m_textfile;
+
+    DECLARE_NO_COPY_CLASS(wxFileTipProvider)
 };
 
 #ifdef __WIN32__
 // TODO an implementation which takes the tips from the given registry key
-class WXDLLEXPORT wxRegTipProvider : public wxTipProvider
+class WXDLLIMPEXP_ADV wxRegTipProvider : public wxTipProvider
 {
 public:
     wxRegTipProvider(const wxString& keyname);
@@ -91,14 +107,14 @@ wxString wxRegTipProvider::GetTip()
 #endif // __WIN32__
 
 // the dialog we show in wxShowTip()
-class WXDLLEXPORT wxTipDialog : public wxDialog
+class WXDLLIMPEXP_ADV wxTipDialog : public wxDialog
 {
 public:
     wxTipDialog(wxWindow *parent,
                 wxTipProvider *tipProvider,
                 bool showAtStartup);
 
-    // the tip dialog has "Show tips on startup" checkbox - return TRUE if it
+    // the tip dialog has "Show tips on startup" checkbox - return true if it
     // was checked (or wasn't unchecked)
     bool ShowTipsOnStartup() const { return m_checkbox->GetValue(); }
 
@@ -115,6 +131,7 @@ private:
     wxCheckBox *m_checkbox;
 
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxTipDialog)
 };
 
 // ============================================================================
@@ -139,34 +156,34 @@ wxString wxFileTipProvider::GetTip()
     {
         return _("Tips not available, sorry!");
     }
-    
+
     wxString tip;
 
     // Comments start with a # symbol.
     // Loop reading lines until get the first one that isn't a comment.
-    // The max number of loop executions is the number of lines in the 
-    // textfile so that can't go into an eternal loop in the [oddball] 
-    // case of a comment-only tips file, or the developer has vetoed 
+    // The max number of loop executions is the number of lines in the
+    // textfile so that can't go into an eternal loop in the [oddball]
+    // case of a comment-only tips file, or the developer has vetoed
     // them all via PreprecessTip().
     for ( size_t i=0; i < count; i++ )
-    {    
-        // The current tip may be at the last line of the textfile, (or 
-        // past it, if the number of lines in the textfile changed, such 
+    {
+        // The current tip may be at the last line of the textfile, (or
+        // past it, if the number of lines in the textfile changed, such
         // as changing to a different textfile, with less tips). So check
         // to see at last line of text file, (or past it)...
         if ( m_currentTip >= count )
         {
             // .. and if so, wrap back to line 0.
             m_currentTip = 0;
-        }  
-        
+        }
+
         // Read the tip, and increment the current tip counter.
         tip = m_textfile.GetLine(m_currentTip++);
-        
-        // Allow a derived class's overrided virtual to modify the tip 
+
+        // Allow a derived class's overrided virtual to modify the tip
         // now if so desired.
-        tip = PreprocessTip(tip); 
-        
+        tip = PreprocessTip(tip);
+
         // Break if tip isn't a comment, and isn't an empty string
         // (or only stray space characters).
         if ( !tip.StartsWith(wxT("#")) && (tip.Trim() != wxEmptyString) )
@@ -174,18 +191,18 @@ wxString wxFileTipProvider::GetTip()
             break;
         }
     }
-        
+
     // If tip starts with '_(', then it is a gettext string of format
     // _("My \"global\" tip text") so first strip off the leading '_("'...
     if ( tip.StartsWith(wxT("_(\"" ), &tip))
     {
         //...and strip off the trailing '")'...
         tip = tip.BeforeLast(wxT('\"'));
-        // ...and replace escaped quotes     
-        tip.Replace(wxT("\\\""), wxT("\"")); 
-    } 
-    
-    return tip;    
+        // ...and replace escaped quotes
+        tip.Replace(wxT("\\\""), wxT("\""));
+    }
+
+    return tip;
 }
 
 // ----------------------------------------------------------------------------
@@ -199,7 +216,7 @@ END_EVENT_TABLE()
 wxTipDialog::wxTipDialog(wxWindow *parent,
                          wxTipProvider *tipProvider,
                          bool showAtStartup)
-           : wxDialog(parent, -1, _("Tip of the Day"),
+           : wxDialog(parent, wxID_ANY, _("Tip of the Day"),
                       wxDefaultPosition, wxDefaultSize,
                       wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
@@ -207,23 +224,30 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
 
     // 1) create all controls in tab order
 
-    wxButton *btnClose = new wxButton(this, wxID_CANCEL, _("&Close"));
+    // 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"));
+#endif
 
-    m_checkbox = new wxCheckBox(this, -1, _("&Show tips at startup"));
+    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
 
-    wxStaticText *text = new wxStaticText(this, -1, _("Did you know..."), wxDefaultPosition, wxSize(-1,30) );
-#if defined(__WXMSW__) || defined(__WXPM__)
-    text->SetFont(wxFont(16, wxSWISS, wxNORMAL, wxBOLD));
-#else
-    text->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxBOLD));
+    wxStaticText *text = new wxStaticText(this, wxID_ANY, _("Did you know..."));
+
+#ifndef __SMARTPHONE__
+    wxFont font = text->GetFont();
+    font.SetPointSize(int(1.6 * font.GetPointSize()));
+    font.SetWeight(wxFONTWEIGHT_BOLD);
+    text->SetFont(font);
 #endif
-//
-//    text->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
 
-    m_text = new wxTextCtrl(this, -1, wxT(""),
+    m_text = new wxTextCtrl(this, wxID_ANY, wxEmptyString,
                             wxDefaultPosition, wxSize(200, 160),
                             wxTE_MULTILINE |
                             wxTE_READONLY |
@@ -232,8 +256,6 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
                             wxSUNKEN_BORDER);
 #if defined(__WXMSW__)
     m_text->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxNORMAL));
-#else
-    m_text->SetFont(wxFont(14, wxSWISS, wxNORMAL, wxNORMAL));
 #endif
 
 //#if defined(__WXPM__)
@@ -245,12 +267,12 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
 //    vBitmap.SetId(wxICON_TIP); // OS/2 specific bitmap method--OS/2 wxBitmaps all have an ID.
 //                               // and for StatBmp's under OS/2 it MUST be a valid resource ID.
 //
-//    wxStaticBitmap*                 bmp = new wxStaticBitmap(this, -1, vBitmap);
+//    wxStaticBitmap*                 bmp = new wxStaticBitmap(this, wxID_ANY, vBitmap);
 //
 //#else
 
     wxIcon icon = wxArtProvider::GetIcon(wxART_TIP, wxART_CMN_DIALOG);
-    wxStaticBitmap *bmp = new wxStaticBitmap(this, -1, icon);
+    wxStaticBitmap *bmp = new wxStaticBitmap(this, wxID_ANY, icon);
 
 //#endif
 
@@ -260,28 +282,34 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
 
     wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );
     icon_text->Add( bmp, 0, wxCENTER );
-    icon_text->Add( text, 1, wxCENTER | wxLEFT, 20 );
-    topsizer->Add( icon_text, 0, wxEXPAND | wxALL, 10 );
+    icon_text->Add( text, 1, wxCENTER | wxLEFT, wxLARGESMALL(20,0) );
+    topsizer->Add( icon_text, 0, wxEXPAND | wxALL, wxLARGESMALL(10,0) );
 
-    topsizer->Add( m_text, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
+    topsizer->Add( m_text, 1, wxEXPAND | wxLEFT|wxRIGHT, wxLARGESMALL(10,0) );
 
     wxBoxSizer *bottom = new wxBoxSizer( wxHORIZONTAL );
     bottom->Add( m_checkbox, 0, wxCENTER );
+
+    // smart phones does not support or do not waste space for wxButtons
+#ifdef __SMARTPHONE__
+    SetRightMenu(wxID_NEXT_TIP, _("Next"));
+    SetLeftMenu(wxID_CANCEL, _("Close"));
+#else
     bottom->Add( 10,10,1 );
-    bottom->Add( btnNext, 0, wxCENTER | wxLEFT, 10 );
-    bottom->Add( btnClose, 0, wxCENTER | wxLEFT, 10 );
-    topsizer->Add( bottom, 0, wxEXPAND | wxALL, 10 );
+    bottom->Add( btnNext, 0, wxCENTER | wxLEFT, wxLARGESMALL(10,0) );
+    bottom->Add( btnClose, 0, wxCENTER | wxLEFT, wxLARGESMALL(10,0) );
+#endif
+
+    topsizer->Add( bottom, 0, wxEXPAND | wxALL, wxLARGESMALL(10,0) );
 
     SetTipText();
 
-    SetAutoLayout(TRUE);
     SetSizer( topsizer );
 
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     Centre(wxBOTH | wxCENTER_FRAME);
-
 }
 
 // ----------------------------------------------------------------------------