Patch from Hartwig for wxMac implementation

[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 16d5cfc6630bd5b43ce7ce483f53d9f3259d67b3..aee0e91ffaf9675cda4ea38c130831c09de12a42 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,8 @@ 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 DoEnable( bool enable );
+    virtual void OnEnabled( bool enabled );

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


@@ -126,11 +127,6 @@ public:
     virtual bool CanSetTransparent();
     virtual wxByte GetTransparent() const ;
     
     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 );
     // event handlers
     // --------------
     void OnSetFocus( wxFocusEvent& event );


@@ -218,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) ;


@@ -315,13 +316,8 @@ protected:
     void                MacUpdateControlFont() ;
 
     void                MacPropagateVisibilityChanged() ;
     void                MacUpdateControlFont() ;
 
     void                MacPropagateVisibilityChanged() ;

-    void                MacPropagateEnabledStateChanged() ;

     void                MacPropagateHiliteChanged() ;
 
     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;
     // implement the base class pure virtuals
     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetSizeFromClientSize( const wxSize & size ) const;