make wxScrollBar derive from wxScrollBarBase under wxMac too

[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 05b616364427caa5689e7215e9714627ce2b5c0c..95039401e2ff010b7d7dcf146574f7690f824677 100644 (file)
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -15,9 +15,9 @@
 #include "wx/brush.h"
 #include "wx/dc.h"
 
 #include "wx/brush.h"
 #include "wx/dc.h"
 

-class WXDLLEXPORT wxButton;
-class WXDLLEXPORT wxScrollBar;
-class WXDLLEXPORT wxTopLevelWindowMac;
+class WXDLLIMPEXP_FWD_CORE wxButton;
+class WXDLLIMPEXP_FWD_CORE wxScrollBar;
+class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowMac;

 
 class wxMacControl ;
 
 
 class wxMacControl ;
 


@@ -55,7 +55,6 @@ public:
     virtual void Lower();
 
     virtual bool Show( bool show = true );
     virtual void Lower();
 
     virtual bool Show( bool show = true );

-    virtual bool Enable( bool enable = true );

 
     virtual void SetFocus();
 
 
     virtual void SetFocus();
 


@@ -84,6 +83,8 @@ public:
                                const wxFont *theFont = NULL )
                                const;
 protected:
                                const wxFont *theFont = NULL )
                                const;
 protected:

+    virtual void DoEnable( bool enable );
+    virtual void OnEnabled( bool enabled );

     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 public:
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 public:
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,


@@ -213,8 +214,13 @@ 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 wxWindow* sb )
+    bool                MacIsWindowScrollbar( const wxWindow* sb ) const

     { return ((wxWindow*)m_hScrollBar == sb || (wxWindow*)m_vScrollBar == sb) ; }
     { return ((wxWindow*)m_hScrollBar == sb || (wxWindow*)m_vScrollBar == sb) ; }

+    virtual bool IsClientAreaChild(const wxWindow *child) const
+    {
+        return !MacIsWindowScrollbar(child) &&
+               wxWindowBase::IsClientAreaChild(child);
+    }

 
     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) ;


@@ -310,7 +316,6 @@ protected:
     void                MacUpdateControlFont() ;
 
     void                MacPropagateVisibilityChanged() ;
     void                MacUpdateControlFont() ;
 
     void                MacPropagateVisibilityChanged() ;

-    void                MacPropagateEnabledStateChanged() ;

     void                MacPropagateHiliteChanged() ;
 
     // implement the base class pure virtuals
     void                MacPropagateHiliteChanged() ;
 
     // implement the base class pure virtuals