add wxUSE_STC wrappers

[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..097890bf33fd163a4baaa181d5d921b87c281d30 100644 (file)
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -55,7 +55,8 @@ public:
     virtual void Lower();
 
     virtual bool Show( bool show = true );
-    virtual bool Enable( bool enable = true );
+    virtual void DoEnable( bool enable );
+    virtual void OnEnabled( bool enabled );
 
     virtual void SetFocus();
 
@@ -65,7 +66,8 @@ public:
                           const wxRect *rect = NULL );
     virtual void Freeze();
     virtual void Thaw();
-
+    virtual bool IsFrozen() const;
+    
     virtual void Update() ;
     virtual void ClearBackground();
 
@@ -125,11 +127,6 @@ public:
     virtual bool CanSetTransparent();
     virtual wxByte GetTransparent() const ;
     
-#if WXWIN_COMPATIBILITY_2_4
-    bool GetTransparentBackground() const { return m_backgroundTransparent; }
-    void SetTransparent(bool t = true) { m_backgroundTransparent = t; }
-#endif
-
     // event handlers
     // --------------
     void OnSetFocus( wxFocusEvent& event );
@@ -142,6 +139,8 @@ public:
 
     bool AcceptsFocus() const;
 
+    virtual bool IsDoubleBuffered() const { return true; }
+
 public:
     static long         MacRemoveBordersFromStyle( long style ) ;
 
@@ -215,8 +214,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 ; }
-    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) ;
@@ -312,13 +311,8 @@ protected:
     void                MacUpdateControlFont() ;
 
     void                MacPropagateVisibilityChanged() ;
-    void                MacPropagateEnabledStateChanged() ;
     void                MacPropagateHiliteChanged() ;
 
-#if WXWIN_COMPATIBILITY_2_4
-    bool                 m_backgroundTransparent ;
-#endif
-
     // implement the base class pure virtuals
     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetSizeFromClientSize( const wxSize & size ) const;