X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e5053ade6b00922decc47f2cf143ef08b5d0cfbb..bc07ab17bf5370f452e899128bf89cc7ca7b98f0:/include/wx/x11/toplevel.h diff --git a/include/wx/x11/toplevel.h b/include/wx/x11/toplevel.h index de89221ca1..675fc4ad08 100644 --- a/include/wx/x11/toplevel.h +++ b/include/wx/x11/toplevel.h @@ -12,10 +12,6 @@ #ifndef _WX_X11_TOPLEVEL_H_ #define _WX_X11_TOPLEVEL_H_ -#ifdef __GNUG__ - #pragma interface "toplevel.h" -#endif - // ---------------------------------------------------------------------------- // wxTopLevelWindowX11 // ---------------------------------------------------------------------------- @@ -50,52 +46,73 @@ public: virtual ~wxTopLevelWindowX11(); // implement base class pure virtuals - virtual void Maximize(bool maximize = TRUE); + virtual void Maximize(bool maximize = true); virtual bool IsMaximized() const; - virtual void Iconize(bool iconize = TRUE); + virtual void Iconize(bool iconize = true); virtual bool IsIconized() const; - virtual void SetIcon(const wxIcon& icon); + virtual void SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); } + virtual void SetIcons(const wxIconBundle& icons); virtual void Restore(); - virtual bool Show(bool show = TRUE); + virtual bool Show( bool show = true ); - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); + virtual bool ShowFullScreen( bool show, long style = wxFULLSCREEN_ALL ); virtual bool IsFullScreen() const { return m_fsIsShowing; } virtual void SetTitle( const wxString& title); virtual wxString GetTitle() const; - - // implementation from now on - // -------------------------- + + // implementation + void SetNeedResizeInIdle( bool set = true ) + { m_needResizeInIdle = set; } + void SetConfigureGeometry( int x, int y, int width, int height ) + { m_x = x; m_y = y; m_width = width; m_height = height; } + + virtual bool SetShape(const wxRegion& region); + + // For implementation purposes - sometimes decorations make the + // client area smaller + virtual wxPoint GetClientAreaOrigin() const; + + virtual void OnInternalIdle(); protected: // common part of all ctors void Init(); - // For implementation purposes - sometimes decorations make the client area - // smaller - virtual wxPoint GetClientAreaOrigin() const; + // set the icon for the window + void DoSetIcon( const wxIcon& icon ); + + // For implementation of delayed resize events + bool m_needResizeInIdle; virtual void DoGetClientSize( int *width, int *height ) const; + virtual void DoGetSize( int *width, int *height ) const; virtual void DoSetClientSize(int width, int height); - - // is the frame currently iconized? + virtual void DoSetSize(int x, int y, + int width, int height, + int sizeFlags = wxSIZE_AUTO); + virtual void DoGetPosition( int *x, int *y ) const; + + // Is the frame currently iconized? bool m_iconized; - // should the frame be maximized when it will be shown? set by Maximize() + // Should the frame be maximized when it will be shown? set by Maximize() // when it is called while the frame is hidden bool m_maximizeOnShow; // Data to save/restore when calling ShowFullScreen - long m_fsStyle; // Passed to ShowFullScreen + long m_fsStyle; // Passed to ShowFullScreen wxRect m_fsOldSize; bool m_fsIsMaximized; bool m_fsIsShowing; wxString m_title; + + // Geometry + int m_x,m_y,m_width,m_height; }; // list of all frames and modeless dialogs //extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows; #endif // _WX_X11_TOPLEVEL_H_ -