SetTextColour is gone

[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 95e240d4db1b13c1eeb38a6f008ba2baafa5033c..16d5cfc6630bd5b43ce7ce483f53d9f3259d67b3 100644 (file)
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -65,7 +65,8 @@ public:
                           const wxRect *rect = NULL );
     virtual void Freeze();
     virtual void Thaw();
                           const wxRect *rect = NULL );
     virtual void Freeze();
     virtual void Thaw();

-
+    virtual bool IsFrozen() const;
+    

     virtual void Update() ;
     virtual void ClearBackground();
 
     virtual void Update() ;
     virtual void ClearBackground();
 


@@ -142,6 +143,8 @@ public:
 
     bool AcceptsFocus() const;
 
 
     bool AcceptsFocus() const;
 

+    virtual bool IsDoubleBuffered() const { return true; }
+

 public:
     static long         MacRemoveBordersFromStyle( long style ) ;
 
 public:
     static long         MacRemoveBordersFromStyle( long style ) ;
 


@@ -215,8 +218,8 @@ public:
     // returns true if the grandchildren need to be clipped to the children's content area
     // (e.g., splitter windows)
     virtual bool        MacClipGrandChildren() const { return false ; }
     // returns true if the grandchildren need to be clipped to the children's content area
     // (e.g., splitter windows)
     virtual bool        MacClipGrandChildren() const { return false ; }

-    bool                MacIsWindowScrollbar( const wxScrollBar* sb )
-    { return (m_hScrollBar == sb || m_vScrollBar == sb) ; }
+    bool                MacIsWindowScrollbar( const wxWindow* sb )
+    { return ((wxWindow*)m_hScrollBar == sb || (wxWindow*)m_vScrollBar == sb) ; }

 
     virtual void        MacInstallEventHandler(WXWidget native) ;
     void                MacPostControlCreate(const wxPoint& pos, const wxSize& size) ;
 
     virtual void        MacInstallEventHandler(WXWidget native) ;
     void                MacPostControlCreate(const wxPoint& pos, const wxSize& size) ;