Clear columns on destruction

[wxWidgets.git] / include / wx / mac / carbon / toplevel.h

diff --git a/include/wx/mac/carbon/toplevel.h b/include/wx/mac/carbon/toplevel.h
index 9383af61c6582103d13b96c61c6021af2c0f9061..d5e11e79ce664105e8fa3ae16e93191206545a62 100644 (file)
--- a/include/wx/mac/carbon/toplevel.h
+++ b/include/wx/mac/carbon/toplevel.h
@@ -12,15 +12,11 @@
 #ifndef _WX_MSW_TOPLEVEL_H_
 #define _WX_MSW_TOPLEVEL_H_
 
 #ifndef _WX_MSW_TOPLEVEL_H_
 #define _WX_MSW_TOPLEVEL_H_
 

-#if wxUSE_SYSTEM_OPTIONS
-    #define wxMAC_WINDOW_PLAIN_TRANSITION _T("mac.window-plain-transition")
-#endif
-

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMac
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMac
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTopLevelWindowMac : public wxTopLevelWindowBase
+class WXDLLIMPEXP_CORE wxTopLevelWindowMac : public wxTopLevelWindowBase

 {
 public:
     // constructors and such
 {
 public:
     // constructors and such


@@ -60,89 +56,31 @@ public:
     virtual bool IsMaximized() const;
     virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;
     virtual bool IsMaximized() const;
     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 ) ); }

     virtual void Restore();
 
     virtual void Restore();
 

-    virtual bool SetShape(const wxRegion& region);
-

     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) ;
     virtual bool IsFullScreen() const ;
 
     // implementation from now on
     // --------------------------
 
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) ;
     virtual bool IsFullScreen() const ;
 
     // implementation from now on
     // --------------------------
 

-    static void MacDelayedDeactivation(long timestamp);
-    virtual void MacCreateRealWindow( const wxString& title,
-                                      const wxPoint& pos,
-                                      const wxSize& size,
-                                      long style,
-                                      const wxString& name ) ;
-    virtual void ClearBackground() ;
-
-    WXWindow MacGetWindowRef() { return m_macWindow ; }
-    virtual void MacActivate( long timestamp , bool inIsActivating ) ;
-    virtual void MacPerformUpdates() ;
-

     virtual void SetTitle( const wxString& title);
     virtual wxString GetTitle() const;
     virtual void SetTitle( const wxString& title);
     virtual wxString GetTitle() const;

-
-    virtual void Raise();
-    virtual void Lower();
-    virtual bool Show( bool show = true );
-
-    virtual void SetExtraStyle(long exStyle) ;
-
-    virtual void MacSetBackgroundBrush( const wxBrush &brush ) ;
-
-    bool MacUsesCompositing() { return m_macUsesCompositing; }
-    virtual void MacInstallTopLevelWindowEventHandler() ;
-
-    bool MacGetMetalAppearance() const ;
-
-    void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ;
-    wxUint32 MacGetWindowAttributes() const ;
-
-    WXEVENTHANDLERREF    MacGetEventHandler() { return m_macEventHandler ; }
-
-    virtual void        MacGetContentAreaInset( int &left , int &top , int &right , int &bottom ) ;
-
+     

 protected:
     // common part of all ctors
     void Init();
 
 protected:
     // common part of all ctors
     void Init();
 

-    virtual void DoGetPosition( int *x, int *y ) const;
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-    virtual void DoGetClientSize(int *width, int *height) const;
-

     // is the frame currently iconized?
     bool m_iconized;
 
     // 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;
     // is the frame currently iconized?
     bool m_iconized;
 
     // 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;

-    bool m_macUsesCompositing ;
-
-    WXWindow m_macWindow ;

 
 

-    wxWindowMac* m_macFocus ;

     void *m_macFullScreenData ;
     void *m_macFullScreenData ;

-
-    static wxTopLevelWindowMac *s_macDeactivateWindow;

 private :
 private :

-    // KH: We cannot let this be called directly since the metal appearance is now managed by an
-    // extra style. Calling this function directly can result in blank white window backgrounds.
-    // This is because the ExtraStyle flags get out of sync with the metal appearance and the metal
-    // logic & checks cease to work as expected. To set the metal appearance, use SetExtraStyle.
-    void MacSetMetalAppearance( bool on ) ;
-
-    WXEVENTHANDLERREF    m_macEventHandler ;
-

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-// list of all frames and modeless dialogs
-extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
-

 #endif // _WX_MSW_TOPLEVEL_H_
 #endif // _WX_MSW_TOPLEVEL_H_