X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e225b106d97e8d99110b4646b151695f8dcf518f..365796b153d710b08a03b92de241574d01c498d7:/src/generic/tipdlg.cpp?ds=sidebyside diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp index 603f7881a9..bac3433d8a 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,7 +93,7 @@ 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, @@ -115,6 +117,7 @@ private: wxCheckBox *m_checkbox; DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxTipDialog) }; // ============================================================================