X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4cc4e7b6ccea5e345e54871f25951e3a0fe2570a..7e08bc5acd8ee4e2f0756f50bf98937a118f9951:/include/wx/univ/toplevel.h?ds=sidebyside diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h index 70f04446c3..d72d9ac85a 100644 --- a/include/wx/univ/toplevel.h +++ b/include/wx/univ/toplevel.h @@ -11,10 +11,6 @@ #ifndef __WX_UNIV_TOPLEVEL_H__ #define __WX_UNIV_TOPLEVEL_H__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univtoplevel.h" -#endif - #include "wx/univ/inpcons.h" #include "wx/univ/inphand.h" #include "wx/icon.h" @@ -92,7 +88,7 @@ enum // wxTopLevelWindow //----------------------------------------------------------------------------- -class WXDLLEXPORT wxTopLevelWindow : public wxTopLevelWindowNative, +class WXDLLIMPEXP_CORE wxTopLevelWindow : public wxTopLevelWindowNative, public wxInputConsumer { public: @@ -119,12 +115,21 @@ public: long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); + // wxUniv-specific methods: do [not] use native decorations for this (or + // all) window(s) + // + // notice that this has no effect if the system doesn't support any native + // decorations anyhow and that by default native decorations are used + // + // if UseNativeDecorations() is used, it must be called before Create() + static void UseNativeDecorationsByDefault(bool native = true); + void UseNativeDecorations(bool native = true); + bool IsUsingNativeDecorations() const; + + // implement base class pure virtuals virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); virtual wxPoint GetClientAreaOrigin() const; - virtual void DoGetClientSize(int *width, int *height) const; - virtual void DoSetClientSize(int width, int height); - virtual void SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); } virtual void SetIcons(const wxIconBundle& icons); // implementation from now on @@ -137,18 +142,26 @@ public: long numArg = -1, const wxString& strArg = wxEmptyString); + static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) + { + return GetStdInputHandler(handlerDef); + } + // move/resize the frame interactively, i.e. let the user do it virtual void InteractiveMove(int flags = wxINTERACTIVE_MOVE); - virtual int GetMinWidth() const; - virtual int GetMinHeight() const; + virtual wxSize GetMinSize() const; + + virtual wxWindow *GetInputWindow() const { return const_cast(this); } protected: + virtual void DoGetClientSize(int *width, int *height) const; + virtual void DoSetClientSize(int width, int height); + // handle titlebar button click event virtual void ClickTitleBarButton(long button); - virtual wxWindow *GetInputWindow() const { return (wxWindow*)this; } - // return wxTOPLEVEL_xxx combination based on current state of the frame long GetDecorationsStyle() const; @@ -163,8 +176,11 @@ protected: static int ms_drawDecorations; // true if wxTLW can be iconized static int ms_canIconize; + + // true if we're using native decorations + bool m_usingNativeDecorations; // true for currently active frame - bool m_isActive:1; + bool m_isActive; // version of icon for titlebar (16x16) wxIcon m_titlebarIcon; // saved window style in fullscreen mdoe @@ -177,27 +193,4 @@ protected: WX_DECLARE_INPUT_CONSUMER() }; -// ---------------------------------------------------------------------------- -// wxStdFrameInputHandler: handles focus, resizing and titlebar buttons clicks -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxStdFrameInputHandler : public wxStdInputHandler -{ -public: - wxStdFrameInputHandler(wxInputHandler *inphand); - - virtual bool HandleMouse(wxInputConsumer *consumer, - const wxMouseEvent& event); - virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event); - virtual bool HandleActivation(wxInputConsumer *consumer, bool activated); - -private: - // the window (button) which has capture or NULL and the last hittest result - wxTopLevelWindow *m_winCapture; - long m_winHitTest; - long m_winPressed; - bool m_borderCursorOn; - wxCursor m_origCursor; -}; - #endif // __WX_UNIV_TOPLEVEL_H__