X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66f8b9ace213e02e184460e0c1a212cacea27edd..26531700c7ec84872c60899ce6219954499086da:/include/wx/motif/toplevel.h diff --git a/include/wx/motif/toplevel.h b/include/wx/motif/toplevel.h index 359b51178b..f6f4bf01bc 100644 --- a/include/wx/motif/toplevel.h +++ b/include/wx/motif/toplevel.h @@ -12,7 +12,7 @@ #ifndef __MOTIFTOPLEVELH__ #define __MOTIFTOPLEVELH__ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "toplevel.h" #endif @@ -44,9 +44,9 @@ public: virtual bool ShowFullScreen( bool show, long style = wxFULLSCREEN_ALL ); virtual bool IsFullScreen() const; - virtual void Maximize(bool maximize = TRUE); + virtual void Maximize(bool maximize = true); virtual void Restore(); - virtual void Iconize(bool iconize = TRUE); + virtual void Iconize(bool iconize = true); virtual bool IsMaximized() const; virtual bool IsIconized() const; @@ -56,10 +56,12 @@ public: virtual wxString GetTitle() const { return m_title; } virtual void SetTitle( const wxString& title ) { m_title = title; } - virtual void SetSizeHints( int minW, int minH, + virtual void DoSetSizeHints( int minW, int minH, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1 ); + virtual bool SetShape( const wxRegion& region ); + WXWidget GetShellWidget() const; protected: // common part of all constructors @@ -67,6 +69,7 @@ protected: // common part of wxDialog/wxFrame destructors void PreDestroy(); + virtual void DoGetPosition(int* x, int* y) const; private: // both these functions should be pure virtual virtual bool DoCreate( wxWindow* parent, wxWindowID id, @@ -76,7 +79,7 @@ private: long style, const wxString& name ) { - return FALSE; + return false; } virtual void DoDestroy() { }