Reverted part of patch #876969 ("Fixes to Borland warnings"), resulted in bugs when...

[wxWidgets.git] / include / wx / toplevel.h

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index c6241a97043b6023acdd52c8028b8b86b860ed0a..02dc3ea81d0c3ad8555ac19c67ed743cb1422ca1 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -14,7 +14,7 @@
 #ifndef _WX_TOPLEVEL_BASE_H_
 #define _WX_TOPLEVEL_BASE_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "toplevelbase.h"
 #endif
 
@@ -111,12 +111,7 @@ public:
     // Set the shape of the window to the given region.
     // Returns TRUE if the platform supports this feature (and the
     // operation is successful.)
-    virtual bool SetShape(const wxRegion& region) { return FALSE; }
-
-    // old functions, use the new ones instead!
-#if WXWIN_COMPATIBILITY_2
-    bool Iconized() const { return IsIconized(); }
-#endif // WXWIN_COMPATIBILITY_2
+    virtual bool SetShape(const wxRegion& WXUNUSED(region)) { return FALSE; }
 
     // implementation only from now on
     // -------------------------------
@@ -158,6 +153,7 @@ protected:
     // the frame icon
     wxIconBundle m_icons;
 
+    DECLARE_NO_COPY_CLASS(wxTopLevelWindowBase)
     DECLARE_EVENT_TABLE()
 };
 
@@ -210,12 +206,10 @@ protected:
                 Create(parent, winid, title, pos, size, style, name);
             }
 
-            DECLARE_DYNAMIC_CLASS(wxTopLevelWindow)
+            DECLARE_DYNAMIC_CLASS_NO_COPY(wxTopLevelWindow)
         };
     #endif // wxTopLevelWindowNative
 #endif // __WXUNIVERSAL__/!__WXUNIVERSAL__
 
 
 #endif // _WX_TOPLEVEL_BASE_H_
-
-// vi:sts=4:sw=4:et