X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b22d16ad20a51052d24d538c22237c97b0ee0b53..9e691f46b2ec1b5dbbff2e51131e3c532e688a89:/include/wx/toplevel.h diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index 9eb6f10f0c..ae36a9fa42 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -47,22 +47,10 @@ enum wxFULLSCREEN_NOSTATUSBAR = 0x0004, wxFULLSCREEN_NOBORDER = 0x0008, wxFULLSCREEN_NOCAPTION = 0x0010, - - wxFULLSCREEN_ALL = wxFULLSCREEN_NOMENUBAR | wxFULLSCREEN_NOTOOLBAR | - wxFULLSCREEN_NOSTATUSBAR | wxFULLSCREEN_NOBORDER | - wxFULLSCREEN_NOCAPTION -}; -// Flags for interactive frame manipulation functions (only in wxUniversal): -enum -{ - wxINTERACTIVE_MOVE = 0x00000001, - wxINTERACTIVE_RESIZE = 0x00000002, - wxINTERACTIVE_RESIZE_S = 0x00000010, - wxINTERACTIVE_RESIZE_N = 0x00000020, - wxINTERACTIVE_RESIZE_W = 0x00000040, - wxINTERACTIVE_RESIZE_E = 0x00000080, - wxINTERACTIVE_WAIT_FOR_INPUT = 0x10000000 + wxFULLSCREEN_ALL = wxFULLSCREEN_NOMENUBAR | wxFULLSCREEN_NOTOOLBAR | + wxFULLSCREEN_NOSTATUSBAR | wxFULLSCREEN_NOBORDER | + wxFULLSCREEN_NOCAPTION }; // ---------------------------------------------------------------------------- @@ -74,10 +62,7 @@ class WXDLLEXPORT wxTopLevelWindowBase : public wxWindow public: // construction wxTopLevelWindowBase(); - -#ifdef __DARWIN__ - virtual ~wxTopLevelWindowBase() {} -#endif + virtual ~wxTopLevelWindowBase(); // top level wnd state // -------------------- @@ -105,7 +90,7 @@ public: // maximize the window to cover entire screen virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) = 0; - + // return TRUE if the frame is in fullscreen mode virtual bool IsFullScreen() const = 0; @@ -122,18 +107,13 @@ public: bool Iconized() const { return IsIconized(); } #endif // WXWIN_COMPATIBILITY_2 - -#ifdef __WXUNIVERSAL__ - // move/resize the frame interactively, i.e. let the user do it - virtual void InteractiveMove(int flags = wxINTERACTIVE_MOVE); -#endif - // implementation only from now on // ------------------------------- // override some base class virtuals virtual bool Destroy(); virtual bool IsTopLevel() const { return TRUE; } + virtual wxSize GetMaxSize() const; // event handlers void OnCloseWindow(wxCloseEvent& event); @@ -170,12 +150,18 @@ protected: #elif defined(__WXGTK__) #include "wx/gtk/toplevel.h" #define wxTopLevelWindowNative wxTopLevelWindowGTK +#elif defined(__WXX11__) + #include "wx/x11/toplevel.h" + #define wxTopLevelWindowNative wxTopLevelWindowX11 #elif defined(__WXMGL__) #include "wx/mgl/toplevel.h" #define wxTopLevelWindowNative wxTopLevelWindowMGL #elif defined(__WXMAC__) #include "wx/mac/toplevel.h" #define wxTopLevelWindowNative wxTopLevelWindowMac +#elif defined(__WXPM__) + #include "wx/os2/toplevel.h" + #define wxTopLevelWindowNative wxTopLevelWindowOS2 #endif #ifdef __WXUNIVERSAL__ @@ -206,3 +192,5 @@ protected: #endif // _WX_TOPLEVEL_BASE_H_ + +// vi:sts=4:sw=4:et