cleanup in toplevel activation, and switching to native carbon event notification...

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

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index a96a6631f0a400e7450f27c76b74c0f5c03871b2..795cadc188ced98c4c7cbd29dedce7c1adabb00a 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -512,12 +512,11 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand
         case kEventWindowActivated :
         {
             toplevelWindow->MacActivate( cEvent.GetTicks() , true) ;
         case kEventWindowActivated :
         {
             toplevelWindow->MacActivate( cEvent.GetTicks() , true) ;

-

             wxActivateEvent wxevent(wxEVT_ACTIVATE, true , toplevelWindow->GetId());
             wxevent.SetTimestamp( cEvent.GetTicks() ) ;
             wxevent.SetEventObject(toplevelWindow);
             toplevelWindow->GetEventHandler()->ProcessEvent(wxevent);
             wxActivateEvent wxevent(wxEVT_ACTIVATE, true , toplevelWindow->GetId());
             wxevent.SetTimestamp( cEvent.GetTicks() ) ;
             wxevent.SetEventObject(toplevelWindow);
             toplevelWindow->GetEventHandler()->ProcessEvent(wxevent);

-            result = noErr ;
+            // we still sending an eventNotHandledErr in order to allow for default processing

             break ;
         }
         case kEventWindowDeactivated :
             break ;
         }
         case kEventWindowDeactivated :


@@ -527,7 +526,7 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand
             wxevent.SetTimestamp( cEvent.GetTicks() ) ;
             wxevent.SetEventObject(toplevelWindow);
             toplevelWindow->GetEventHandler()->ProcessEvent(wxevent);
             wxevent.SetTimestamp( cEvent.GetTicks() ) ;
             wxevent.SetEventObject(toplevelWindow);
             toplevelWindow->GetEventHandler()->ProcessEvent(wxevent);

-            result = noErr ;
+            // we still sending an eventNotHandledErr in order to allow for default processing

             break ;
         }
        case kEventWindowShown :
             break ;
         }
        case kEventWindowShown :


@@ -961,8 +960,10 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
     {
         ::CreateRootControl( (WindowRef)m_macWindow , (ControlRef*)&m_macControl ) ;
     }
     {
         ::CreateRootControl( (WindowRef)m_macWindow , (ControlRef*)&m_macControl ) ;
     }

+    // the root control level handleer

     MacInstallEventHandler() ;
 
     MacInstallEventHandler() ;
 

+    // the frame window event handler

     InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
     MacInstallTopLevelWindowEventHandler() ;
     
     InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
     MacInstallTopLevelWindowEventHandler() ;
     

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 9d09716b24c224415daa51c920e8ccb208493f5b..28e556b17d8001194ad70e697fede9f6f746681b 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -105,10 +105,14 @@ pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessa
 static const EventTypeSpec eventList[] =
 {
 #if TARGET_API_MAC_OSX
 static const EventTypeSpec eventList[] =
 {
 #if TARGET_API_MAC_OSX

-       { kEventClassControl , kEventControlDraw } ,
+    { kEventClassControl , kEventControlDraw } ,
+    { kEventClassControl , kEventControlVisibilityChanged } ,
+    { kEventClassControl , kEventControlEnabledStateChanged } ,
+    { kEventClassControl , kEventControlHiliteChanged } ,

 //     { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only
 //  { kEventClassControl , kEventControlBoundsChanged } ,
 //     { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only
 //  { kEventClassControl , kEventControlBoundsChanged } ,

-// kEventControlEnabledStateChanged , kEventControlVisibilityChanged , kEventControlHiliteChanged
+
+    {}

 #else
     {}
 #endif
 #else
     {}
 #endif


@@ -149,6 +153,15 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                     result = eventNotHandledErr; 
             }
             break ;
                     result = eventNotHandledErr; 
             }
             break ;

+        case kEventControlVisibilityChanged :
+                thisWindow->MacVisibilityChanged() ;
+            break ;
+        case kEventControlEnabledStateChanged :
+                thisWindow->MacEnabledStateChanged() ;
+            break ;
+        case kEventControlHiliteChanged :
+                thisWindow->MacHiliteChanged() ;
+            break ;

         default :
             break ;
     }
         default :
             break ;
     }


@@ -1540,6 +1553,7 @@ bool wxWindowMac::Enable(bool enable)
 
 void wxWindowMac::MacPropagateVisibilityChanged()
 {
 
 void wxWindowMac::MacPropagateVisibilityChanged()
 {

+#if !TARGET_API_MAC_OSX

     MacVisibilityChanged() ;
     
     wxWindowListNode *node = GetChildren().GetFirst();
     MacVisibilityChanged() ;
     
     wxWindowListNode *node = GetChildren().GetFirst();


@@ -1550,10 +1564,12 @@ void wxWindowMac::MacPropagateVisibilityChanged()
             child->MacPropagateVisibilityChanged(  ) ;
         node = node->GetNext();
     }
             child->MacPropagateVisibilityChanged(  ) ;
         node = node->GetNext();
     }

+#endif

 }
 
 void wxWindowMac::MacPropagateEnabledStateChanged( )
 {
 }
 
 void wxWindowMac::MacPropagateEnabledStateChanged( )
 {

+#if !TARGET_API_MAC_OSX

     MacEnabledStateChanged() ;
     
     wxWindowListNode *node = GetChildren().GetFirst();
     MacEnabledStateChanged() ;
     
     wxWindowListNode *node = GetChildren().GetFirst();


@@ -1564,10 +1580,12 @@ void wxWindowMac::MacPropagateEnabledStateChanged( )
             child->MacPropagateEnabledStateChanged() ;
         node = node->GetNext();
     }
             child->MacPropagateEnabledStateChanged() ;
         node = node->GetNext();
     }

+#endif

 }
 
 void wxWindowMac::MacPropagateHiliteChanged( )
 {
 }
 
 void wxWindowMac::MacPropagateHiliteChanged( )
 {

+#if !TARGET_API_MAC_OSX

     MacHiliteChanged() ;
     
     wxWindowListNode *node = GetChildren().GetFirst();
     MacHiliteChanged() ;
     
     wxWindowListNode *node = GetChildren().GetFirst();


@@ -1578,6 +1596,7 @@ void wxWindowMac::MacPropagateHiliteChanged( )
             child->MacPropagateHiliteChanged() ;
         node = node->GetNext();
     }
             child->MacPropagateHiliteChanged() ;
         node = node->GetNext();
     }

+#endif

 }
 
 //
 }
 
 //