X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e39af974ef7846e26686ae39d74e4696c1fef0c3..1981118d4bcd47bdbe4de66aba3e5db6368c7517:/include/wx/toplevel.h diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index c6241a9704..02dc3ea81d 100644 --- 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