Clear columns on destruction

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

diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h
index 3410dcb801fda59e3bf1ccbe4b2b0f925be0e891..0092b70fc799dad55d15abfbe65d8ce6cab81f3a 100644 (file)
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -17,11 +17,11 @@
 
 class WXDLLIMPEXP_FWD_CORE wxButton;
 class WXDLLIMPEXP_FWD_CORE wxScrollBar;
-class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowMac;
+class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow;
 
 class WXDLLIMPEXP_FWD_CORE wxMacControl ;
 
-class WXDLLEXPORT wxWindowMac: public wxWindowBase
+class WXDLLIMPEXP_CORE wxWindowMac: public wxWindowBase
 {
     DECLARE_DYNAMIC_CLASS(wxWindowMac)
 
@@ -56,6 +56,8 @@ public:
 
     virtual bool Show( bool show = true );
 
+    virtual bool IsShownOnScreen() const;
+
     virtual void SetFocus();
 
     virtual void WarpPointer( int x, int y );
@@ -175,7 +177,7 @@ public:
     void                MacInvalidateBorders() ;
 
     WXWindow            MacGetTopLevelWindowRef() const ;
-    wxTopLevelWindowMac* MacGetTopLevelWindow() const ;
+    wxNonOwnedWindow*   MacGetTopLevelWindow() const ;
 
     virtual long        MacGetLeftBorderSize() const ;
     virtual long        MacGetRightBorderSize() const ;
@@ -193,7 +195,6 @@ public:
     virtual void        MacHiliteChanged() ;
     virtual wxInt32     MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
 
-    bool                MacIsReallyShown() ;
     bool                MacIsReallyEnabled() ;
     bool                MacIsReallyHilited() ;