From: Robin Dunn <robin@alldunn.com>
Date: Sat, 9 Sep 2006 18:12:59 +0000 (+0000)
Subject: Simplify use of MacIsWindowScrollbar
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/31e1bd370d2ded34d97f4824029adb924a0a58a4

Simplify use of MacIsWindowScrollbar


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h
index 95e240d4db..68a0a4f36b 100644
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -215,8 +215,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) ;
diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 42aa660a50..d465bc0511 100644
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -71,11 +71,9 @@ bool wxControlContainer::AcceptsFocus() const
             node = node->GetNext();
 
 #ifdef __WXMAC__
-            wxScrollBar *sb = wxDynamicCast( child , wxScrollBar ) ;
-            if ( sb == NULL || !m_winParent->MacIsWindowScrollbar( sb ) )
-                hasRealChildren = true ;
-            if ( sb && m_winParent->MacIsWindowScrollbar( sb ) )
+            if ( m_winParent->MacIsWindowScrollbar( child ) )
                 continue;
+            hasRealChildren = true ;
 #endif
             if ( child->AcceptsFocus() )
             {
@@ -641,8 +639,7 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
         node = node->GetNext();
 
 #ifdef __WXMAC__
-        wxScrollBar *sb = wxDynamicCast( child , wxScrollBar ) ;
-        if ( sb && child->GetParent()->MacIsWindowScrollbar( sb ) )
+        if ( child->GetParent()->MacIsWindowScrollbar( child ) )
             continue;
 #endif