X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/70373b5a57223350e0fcc4968920f81463dc6125..6968a3b87cee46f5c5af9b46e1ef97f17133cef7:/include/wx/tipdlg.h?ds=sidebyside diff --git a/include/wx/tipdlg.h b/include/wx/tipdlg.h index fe7a6be5c4..3c99c6d135 100644 --- a/include/wx/tipdlg.h +++ b/include/wx/tipdlg.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: tipdlg.h +// Name: wx/tipdlg.h // Purpose: declaration of wxTipDialog // Author: Vadim Zeitlin // Modified by: @@ -12,10 +12,6 @@ #ifndef _WX_TIPDLG_H_ #define _WX_TIPDLG_H_ -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma interface "tipdlg.h" -#endif - // ---------------------------------------------------------------------------- // headers which we must include here // ---------------------------------------------------------------------------- @@ -36,21 +32,21 @@ // wxTipProvider evidently needs some internal state which is the tip "index" // and which should be saved/restored by the program to not always show one and // the same tip (of course, you may use random starting position as well...) -class WXDLLEXPORT wxTipProvider +class WXDLLIMPEXP_ADV wxTipProvider { public: wxTipProvider(size_t currentTip) { m_currentTip = currentTip; } // get the current tip and update the internal state to return the next tip // when called for the next time - virtual wxString GetTip() = 0; + virtual wxString GetTip() = 0; // get the current tip "index" (or whatever allows the tip provider to know // from where to start the next time) size_t GetCurrentTip() const { return m_currentTip; } - // Allows any user-derived class to optionally override this function to - // modify the tip as soon as it is read. If return wxEmptyString, then + // Allows any user-derived class to optionally override this function to + // modify the tip as soon as it is read. If return wxEmptyString, then // the tip is skipped, and the next one is read. virtual wxString PreprocessTip(const wxString& tip) { return tip; } @@ -65,8 +61,10 @@ protected: // specified text file as the source of tips (each line is a tip). // // NB: the caller is responsible for deleting the pointer! -WXDLLEXPORT wxTipProvider *wxCreateFileTipProvider(const wxString& filename, - size_t currentTip); +#if wxUSE_TEXTFILE +WXDLLIMPEXP_ADV wxTipProvider *wxCreateFileTipProvider(const wxString& filename, + size_t currentTip); +#endif // wxUSE_TEXTFILE // ---------------------------------------------------------------------------- // wxTipDialog @@ -78,10 +76,10 @@ WXDLLEXPORT wxTipProvider *wxCreateFileTipProvider(const wxString& filename, // the user to disable this (however, it's the program which should show, or // not, the dialog on startup depending on its value, not this class). // -// The function returns TRUE if this checkbox is checked, FALSE otherwise. -WXDLLEXPORT bool wxShowTip(wxWindow *parent, - wxTipProvider *tipProvider, - bool showAtStartup = TRUE); +// The function returns true if this checkbox is checked, false otherwise. +WXDLLIMPEXP_ADV bool wxShowTip(wxWindow *parent, + wxTipProvider *tipProvider, + bool showAtStartup = true); #endif // wxUSE_STARTUP_TIPS