X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c4fbbf1599c9912dab85d69798c6bcc97d907f2..6ad49e18b9ed3623b263e7b45e78f53dec395ede:/src/generic/tipdlg.cpp diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp index 8a10c41b60..78a423326e 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,7 @@ // constants // ---------------------------------------------------------------------------- -static const int wxID_NEXT_TIP = -100; // whatever +static const int wxID_NEXT_TIP = 32000; // whatever // ---------------------------------------------------------------------------- // private classes @@ -61,7 +61,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 +70,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 +93,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 +117,7 @@ private: wxCheckBox *m_checkbox; DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxTipDialog) }; // ============================================================================ @@ -136,17 +139,56 @@ wxString wxFileTipProvider::GetTip() { size_t count = m_textfile.GetLineCount(); if ( !count ) + { 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 + // 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; + } + } - // 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 ) + // 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)) { - // wrap - m_currentTip = 0; + //...and strip off the trailing '")'... + tip = tip.BeforeLast(wxT('\"')); + // ...and replace escaped quotes + tip.Replace(wxT("\\\""), wxT("\"")); } - return m_textfile.GetLine(m_currentTip++); + return tip; } // ---------------------------------------------------------------------------- @@ -160,7 +202,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) { @@ -170,12 +212,12 @@ wxTipDialog::wxTipDialog(wxWindow *parent, wxButton *btnClose = new wxButton(this, wxID_CANCEL, _("&Close")); - 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); wxButton *btnNext = new wxButton(this, wxID_NEXT_TIP, _("&Next Tip")); - wxStaticText *text = new wxStaticText(this, -1, _("Did you know..."), wxDefaultPosition, wxSize(-1,30) ); + wxStaticText *text = new wxStaticText(this, wxID_ANY, _("Did you know..."), wxDefaultPosition, wxSize(-1,30) ); #if defined(__WXMSW__) || defined(__WXPM__) text->SetFont(wxFont(16, wxSWISS, wxNORMAL, wxBOLD)); #else @@ -184,7 +226,7 @@ wxTipDialog::wxTipDialog(wxWindow *parent, // // 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 | @@ -197,23 +239,23 @@ wxTipDialog::wxTipDialog(wxWindow *parent, m_text->SetFont(wxFont(14, wxSWISS, wxNORMAL, wxNORMAL)); #endif -#if defined(__WXPM__) +//#if defined(__WXPM__) // // The only way to get icons into an OS/2 static bitmap control // - wxBitmap vBitmap; +// wxBitmap vBitmap; - 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 +// 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, 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 +//#endif // 2) put them in boxes @@ -235,7 +277,6 @@ wxTipDialog::wxTipDialog(wxWindow *parent, SetTipText(); - SetAutoLayout(TRUE); SetSizer( topsizer ); topsizer->SetSizeHints( this );