X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/70373b5a57223350e0fcc4968920f81463dc6125..fe164c3e2ea5453896cd63a5440a26365daec1bc:/src/generic/tipdlg.cpp diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp index 7bd4d9ecc3..9e450d4bad 100644 --- a/src/generic/tipdlg.cpp +++ b/src/generic/tipdlg.cpp @@ -53,7 +53,7 @@ // constants // ---------------------------------------------------------------------------- -static const int wxID_NEXT_TIP = -100; // whatever +static const int wxID_NEXT_TIP = 32000; // whatever // ---------------------------------------------------------------------------- // private classes @@ -70,6 +70,8 @@ public: private: wxTextFile m_textfile; + + DECLARE_NO_COPY_CLASS(wxFileTipProvider) }; #ifdef __WIN32__ @@ -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