removed Win16 code (patch 905241), last version with remains of Win16 support tagged...

[wxWidgets.git] / src / mac / carbon / window.cpp

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 808db5c2be435e879386963b3641ec1a11d76801..6475e3f25d3752033d8beee15524ced682d0b344 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -2184,7 +2184,9 @@ wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
             {
                 int x , y ;
                 wxSize size ;
             {
                 int x , y ;
                 wxSize size ;

-                if ( parent->IsTopLevel() && child->IsKindOf( CLASSINFO( wxToolBar ) ) )
+                // we have to find a better clipping algorithm here, in order not to clip things
+                // positioned like status and toolbar
+                if ( 1 /* parent->IsTopLevel() && child->IsKindOf( CLASSINFO( wxToolBar ) ) */ )

                 {
                     size = parent->GetSize() ;
                     x = y = 0 ;
                 {
                     size = parent->GetSize() ;
                     x = y = 0 ;


@@ -2562,7 +2564,6 @@ void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
             x += origin.x ;
             y += origin.y ;
         }
             x += origin.x ;
             y += origin.y ;
         }

-        ControlRef   control ;

         Point       localwhere ;
         SInt16      controlpart ;
         
         Point       localwhere ;
         SInt16      controlpart ;
         


@@ -2585,20 +2586,21 @@ void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
     
         if ( event.m_metaDown )
             modifiers |= cmdKey ;
     
         if ( event.m_metaDown )
             modifiers |= cmdKey ;

+
+        bool handled = false ;
+
+        if ( ::IsControlActive( (ControlRef) m_macControl ) )

         {
         {

-            control = (ControlRef) m_macControl ;
-            if ( control && ::IsControlActive( control ) )
+            controlpart = ::HandleControlClick( (ControlRef) m_macControl , localwhere , modifiers , (ControlActionUPP) -1 ) ;
+            wxTheApp->s_lastMouseDown = 0 ;
+            if ( controlpart != kControlNoPart ) 

             {
             {

-                {
-                    controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ;
-                    wxTheApp->s_lastMouseDown = 0 ;
-                    if ( control && controlpart != kControlNoPart ) 
-                    {
-                        MacHandleControlClick((WXWidget)  control , controlpart , false /* mouse not down anymore */ ) ;
-                    }
-                }
+                MacHandleControlClick((WXWidget)  (ControlRef) m_macControl , controlpart , false /* mouse not down anymore */ ) ;
+                handled = true ;

             }
         }
             }
         }

+        if ( !handled )
+            event.Skip() ;

     }
     else
     {
     }
     else
     {