fixes to ShowFullScreen (KDE 3.1)

[wxWidgets.git] / src / generic / tipdlg.cpp

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 7bd4d9ecc303c7f93f1ab5ae57d52d052d0bb7bd..bfb16d90ec6f5be256eece573f067e5714127589 100644 (file)
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -115,6 +115,7 @@ private:
     wxCheckBox *m_checkbox;
 
     DECLARE_EVENT_TABLE()
     wxCheckBox *m_checkbox;
 
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxTipDialog)

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -236,23 +237,23 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
     m_text->SetFont(wxFont(14, wxSWISS, wxNORMAL, wxNORMAL));
 #endif
 
     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
     //
     //
     // 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, -1, vBitmap);
+//
+//#else

 
     wxIcon icon = wxArtProvider::GetIcon(wxART_TIP, wxART_CMN_DIALOG);
     wxStaticBitmap *bmp = new wxStaticBitmap(this, -1, icon);
 
 
     wxIcon icon = wxArtProvider::GetIcon(wxART_TIP, wxART_CMN_DIALOG);
     wxStaticBitmap *bmp = new wxStaticBitmap(this, -1, icon);
 

-#endif
+//#endif

 
     // 2) put them in boxes
 
 
     // 2) put them in boxes