X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77df2fbce63ee136e2b0004a54b09c47e4576bf4..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/x11/toplevel.h diff --git a/include/wx/x11/toplevel.h b/include/wx/x11/toplevel.h index 4ca3ac2df1..7aaffb5243 100644 --- a/include/wx/x11/toplevel.h +++ b/include/wx/x11/toplevel.h @@ -12,15 +12,11 @@ #ifndef _WX_X11_TOPLEVEL_H_ #define _WX_X11_TOPLEVEL_H_ -#ifdef __GNUG__ - #pragma interface "toplevel.h" -#endif - // ---------------------------------------------------------------------------- // wxTopLevelWindowX11 // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTopLevelWindowX11 : public wxTopLevelWindowBase +class WXDLLIMPEXP_CORE wxTopLevelWindowX11 : public wxTopLevelWindowBase { public: // constructors and such @@ -50,43 +46,53 @@ 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 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 IsFullScreen() const { return m_fsIsShowing; } virtual void SetTitle( const wxString& title); virtual wxString GetTitle() const; - + // implementation - void SetNeedResizeInIdle( bool set = TRUE ) { m_needResizeInIdle = set; } - -protected: - // common part of all ctors - void Init(); + 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(); + + // set the icon for the window + void DoSetIcon( const wxIcon& icon ); + // For implementation of delayed resize events bool m_needResizeInIdle; - virtual void OnInternalIdle(); virtual void DoGetClientSize( int *width, int *height ) const; + virtual void DoGetSize( int *width, int *height ) const; virtual void DoSetClientSize(int width, int height); 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; @@ -100,10 +106,12 @@ protected: 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; +//extern WXDLLIMPEXP_DATA_CORE(wxWindowList) wxModelessWindows; #endif // _WX_X11_TOPLEVEL_H_ -