X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/295272bdcd784fbe2b33883d00cff0f5c0ca5341..a689b6d6dd19f6c7d369079a8330cde24f3bf7aa:/src/generic/tipdlg.cpp

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 33a019fc11..d9d19cd600 100644
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -45,6 +45,7 @@
 #endif // WX_PRECOMP
 
 #include "wx/statline.h"
+#include "wx/artprov.h"
 
 #include "wx/tipdlg.h"
 
@@ -52,7 +53,7 @@
 // constants
 // ----------------------------------------------------------------------------
 
-static const int wxID_NEXT_TIP = -100;  // whatever
+static const int wxID_NEXT_TIP = 32000;  // whatever
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -114,6 +115,7 @@ private:
     wxCheckBox *m_checkbox;
 
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxTipDialog)
 };
 
 // ============================================================================
@@ -135,17 +137,56 @@ wxString wxFileTipProvider::GetTip()
 {
     size_t count = m_textfile.GetLineCount();
     if ( !count )
-        return _("Tips not available, sorry!");
-
-    // notice that it may be greater, actually, if we remembered it from the
-    // last time and the number of tips changed
-    if ( m_currentTip == count )
     {
-        // wrap
-        m_currentTip = 0;
+        return _("Tips not available, sorry!");
     }
-
-    return m_textfile.GetLine(m_currentTip++);
+    
+    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 
+    // 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 
+        // 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 
+        // now if so desired.
+        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) )
+        {
+            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;    
 }
 
 // ----------------------------------------------------------------------------
@@ -175,7 +216,7 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
     wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next Tip"));
 
     wxStaticText *text = new wxStaticText(this, -1, _("Did you know..."), wxDefaultPosition, wxSize(-1,30) );
-#if defined(__WXMSW__)
+#if defined(__WXMSW__) || defined(__WXPM__)
     text->SetFont(wxFont(16, wxSWISS, wxNORMAL, wxBOLD));
 #else
     text->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxBOLD));
@@ -187,28 +228,33 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
                             wxDefaultPosition, wxSize(200, 160),
                             wxTE_MULTILINE |
                             wxTE_READONLY |
+                            wxTE_NO_VSCROLL |
                             wxTE_RICH | // a hack to get rid of vert scrollbar
                             wxSUNKEN_BORDER);
 #if defined(__WXMSW__)
-    m_text->SetFont(wxFont(12, wxROMAN, wxNORMAL, wxNORMAL));
+    m_text->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxNORMAL));
 #else
-    m_text->SetFont(wxFont(14, wxROMAN, wxNORMAL, wxNORMAL));
+    m_text->SetFont(wxFont(14, wxSWISS, wxNORMAL, wxNORMAL));
 #endif
 
-#if defined(__WXMSW__) || defined(__WXPM__)
-    wxIcon icon("wxICON_TIP");
-#else
-    // XPM hack: make the arrays const
-    #define static static const
+//#if defined(__WXPM__)
+    //
+    // The only way to get icons into an OS/2 static bitmap control
+    //
+//    wxBitmap                        vBitmap;
 
-    #include "wx/generic/tip.xpm"
-
-    #undef static
+//    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);
+//
+//#else
 
-    wxIcon icon(tipIcon);
-#endif
+    wxIcon icon = wxArtProvider::GetIcon(wxART_TIP, wxART_CMN_DIALOG);
     wxStaticBitmap *bmp = new wxStaticBitmap(this, -1, icon);
 
+//#endif
+
     // 2) put them in boxes
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );