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

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 7bd4d9ecc3..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)
 };
 
 // ============================================================================
@@ -236,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;
-
-    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.
+//    wxBitmap                        vBitmap;
 
-    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, -1, vBitmap);
+//
+//#else
 
     wxIcon icon = wxArtProvider::GetIcon(wxART_TIP, wxART_CMN_DIALOG);
     wxStaticBitmap *bmp = new wxStaticBitmap(this, -1, icon);
 
-#endif
+//#endif
 
     // 2) put them in boxes