X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d9f12f3b9f997b6308faf336d5381be591b71f4..ccdcde00d9ae27ca20ff6c3c9495918a0ec725aa:/include/wx/frame.h?ds=sidebyside diff --git a/include/wx/frame.h b/include/wx/frame.h index ee6e5c792f..ac7e48f61c 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -54,9 +54,7 @@ class WXDLLEXPORT wxFrameBase : public wxTopLevelWindow public: // construction wxFrameBase(); -#ifdef __DARWIN__ - virtual ~wxFrameBase() { } -#endif + virtual ~wxFrameBase(); wxFrame *New(wxWindow *parent, wxWindowID id, @@ -142,6 +140,17 @@ public: void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin); #endif // wxUSE_MENUS + // if there is no real wxTopLevelWindow on this platform we have to define + // some wxTopLevelWindowBase pure virtual functions here to avoid breaking + // old ports (wxMotif) which don't define them in wxFrame +#ifndef wxTopLevelWindowNative + virtual bool ShowFullScreen(bool WXUNUSED(show), + long WXUNUSED(style) = wxFULLSCREEN_ALL) + { return FALSE; } + virtual bool IsFullScreen() const + { return FALSE; } +#endif // no wxTopLevelWindowNative + protected: // the frame main menu/status/tool bars // ------------------------------------ @@ -192,50 +201,21 @@ protected: }; // include the real class declaration -#if defined(__WXMSW__) - #include "wx/msw/frame.h" - #define wxFrameNative wxFrameMSW -#elif defined(__WXGTK__) - #include "wx/gtk/frame.h" - #define wxFrameNative wxFrameGTK -#elif defined(__WXMOTIF__) - #include "wx/motif/frame.h" -#elif defined(__WXMAC__) - #include "wx/mac/frame.h" - #define wxFrameNative wxFrameMac -#elif defined(__WXMGL__) - #include "wx/mgl/frame.h" - #define wxFrameNative wxFrameMGL -#elif defined(__WXPM__) - #include "wx/os2/frame.h" - #define wxFrameNative wxFrameOS2 -#endif - -#ifdef __WXUNIVERSAL__ +#if defined(__WXUNIVERSAL__) // && !defined(__WXMICROWIN__) #include "wx/univ/frame.h" #else // !__WXUNIVERSAL__ - #ifdef wxFrameNative - class WXDLLEXPORT wxFrame : public wxFrameNative - { - public: - // construction - wxFrame() { Init(); } - wxFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - Create(parent, id, title, pos, size, style, name); - } - - DECLARE_DYNAMIC_CLASS(wxFrame) - }; - #endif // wxFrameNative -#endif // __WXUNIVERSAL__/!__WXUNIVERSAL__ + #if defined(__WXMSW__) + #include "wx/msw/frame.h" + #elif defined(__WXGTK__) + #include "wx/gtk/frame.h" + #elif defined(__WXMOTIF__) + #include "wx/motif/frame.h" + #elif defined(__WXMAC__) + #include "wx/mac/frame.h" + #elif defined(__WXPM__) + #include "wx/os2/frame.h" + #endif +#endif #endif // _WX_FRAME_H_BASE_