Added global skope too FinControl()

[wxWidgets.git] / src / mac / toolbar.cpp

diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp
index 152e1aaddfce3fdc39a4c8a49ec8554538c67a2f..f9e68cbd21dc508a28dc3d3ff3989eb9f51ac994 100644 (file)
--- a/src/mac/toolbar.cpp
+++ b/src/mac/toolbar.cpp
@@ -169,9 +169,9 @@ bool wxToolBar::Realize()
         return FALSE;
 
     Point localOrigin ;
         return FALSE;
 
     Point localOrigin ;

-    Rect clipRect ;
+    //    Rect clipRect ;

     WindowRef window = (WindowRef) MacGetRootWindow() ;
     WindowRef window = (WindowRef) MacGetRootWindow() ;

-    wxWindow *win ;
+    //    wxWindow *win ;

     
     int lx , ly ;
     lx = ly = 0 ;
     
     int lx , ly ;
     lx = ly = 0 ;


@@ -360,9 +360,9 @@ void wxToolBar::MacSuperChangedPosition()
   {
 
     Point localOrigin ;
   {
 
     Point localOrigin ;

-    Rect clipRect ;
-    WindowRef window ;
-    wxWindow *win ;
+    //    Rect clipRect ;
+    //    WindowRef window ;
+    //    wxWindow *win ;

     int lx , ly ;
     lx = ly = 0 ;
     MacWindowToRootWindow( &lx , &ly ) ;
     int lx , ly ;
     lx = ly = 0 ;
     MacWindowToRootWindow( &lx , &ly ) ;


@@ -612,7 +612,7 @@ void  wxToolBar::OnMouse( wxMouseEvent &event )
                if ( event.m_metaDown )
                        modifiers |= cmdKey ;
        
                if ( event.m_metaDown )
                        modifiers |= cmdKey ;
        

-               controlpart = FindControl( localwhere , window , &control ) ;
+               controlpart = ::FindControl( localwhere , window , &control ) ;

                {
                        if ( control && ::IsControlActive( control ) )
                        {
                {
                        if ( control && ::IsControlActive( control ) )
                        {