X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6bc3b8e9680e8aa3d50ae4bb41dad22c6dd3ce1b..04f109ec63bb2522e520ce9239828e8ee41cd61c:/include/wx/mac/classic/toplevel.h?ds=sidebyside diff --git a/include/wx/mac/classic/toplevel.h b/include/wx/mac/classic/toplevel.h index 24818b4920..16bfad5354 100644 --- a/include/wx/mac/classic/toplevel.h +++ b/include/wx/mac/classic/toplevel.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/toplevel.h +// Name: wx/mac/classic/toplevel.h // Purpose: wxTopLevelWindowMac is the Mac implementation of wxTLW // Author: Stefan Csomor // Modified by: @@ -12,10 +12,6 @@ #ifndef _WX_MSW_TOPLEVEL_H_ #define _WX_MSW_TOPLEVEL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "toplevel.h" -#endif - #if wxUSE_SYSTEM_OPTIONS #define wxMAC_WINDOW_PLAIN_TRANSITION _T("mac.window-plain-transition") #endif @@ -54,9 +50,9 @@ public: virtual ~wxTopLevelWindowMac(); // 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) { SetIcon( icons.GetIcon( -1 ) ); } @@ -65,8 +61,8 @@ public: virtual bool SetShape(const wxRegion& region); virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style) = wxFULLSCREEN_ALL) - { return FALSE; } - virtual bool IsFullScreen() const { return FALSE; } + { return false; } + virtual bool IsFullScreen() const { return false; } // implementation from now on // -------------------------- @@ -91,15 +87,18 @@ public: virtual void MacKeyDown( WXEVENTREF ev ) ; #endif virtual void MacFireMouseEvent( wxUint16 kind , wxInt32 x , wxInt32 y ,wxUint32 modifiers , long timestamp ) ; + + virtual void SetTitle( const wxString& title); + virtual wxString GetTitle() const; + virtual void Raise(); virtual void Lower(); - virtual void SetTitle( const wxString& title); - virtual bool Show( bool show = TRUE ); + virtual bool Show( bool show = true ); virtual void DoMoveWindow(int x, int y, int width, int height); void MacInvalidate( const WXRECTPTR rect, bool eraseBackground ) ; short MacGetWindowBackgroundTheme() const { return m_macWindowBackgroundTheme ; } - static bool MacEnableCompositing( bool useCompositing ); - bool MacUsesCompositing() { return m_macUsesCompositing; } + static bool MacEnableCompositing( bool useCompositing ); + bool MacUsesCompositing() { return m_macUsesCompositing; } #if TARGET_CARBON WXEVENTHANDLERREF MacGetEventHandler() { return m_macEventHandler ; } @@ -142,4 +141,3 @@ void wxRemoveMacWindowAssociation(wxTopLevelWindowMac *win) ; #endif // _WX_MSW_TOPLEVEL_H_ -