I still think that's needed ...

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

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index a947e73f60d29310be791dff048fc7c5ff03bd6e..23e288ea882c407fef1575cf6a0798b730ecf068 100644 (file)
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -374,13 +374,13 @@ bool wxMenu::ProcessCommand(wxCommandEvent & event)
 
     // Try the menu's event handler
     if ( /* !processed && */ GetEventHandler())
-        processed = GetEventHandler()->ProcessEvent(event);
+        processed = GetEventHandler()->SafelyProcessEvent(event);
 
     // Try the window the menu was popped up from
     // (and up through the hierarchy)
     wxWindow *win = GetInvokingWindow();
     if ( !processed && win )
-        processed = win->GetEventHandler()->ProcessEvent(event);
+        processed = win->HandleWindowEvent(event);
 
     return processed;
 }
@@ -465,14 +465,12 @@ void wxMenu::MacBeforeDisplay( bool isSubMenu )
         }
         else // normal item
         {
-#if TARGET_CARBON
             // what we do here is to hide the special items which are
             // shown in the application menu anyhow -- it doesn't make
             // sense to show them in their normal place as well
             if ( item->GetId() == wxApp::s_macAboutMenuItemId ||
-                ( UMAGetSystemVersion() >= 0x1000 && (
                     item->GetId() == wxApp::s_macPreferencesMenuItemId ||
-                    item->GetId() == wxApp::s_macExitMenuItemId ) ) )
+                    item->GetId() == wxApp::s_macExitMenuItemId )
 
             {
                 ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ),
@@ -520,7 +518,6 @@ void wxMenu::MacBeforeDisplay( bool isSubMenu )
                                               0 );
                 }
             }
-#endif // TARGET_CARBON
         }
 
         previousItem = item ;
@@ -570,14 +567,16 @@ wxInt32 wxMenu::MacHandleCommandProcess( wxMenuItem* item, int id, wxWindow* tar
             event.SetEventObject(targetWindow);
             event.SetInt(item->IsCheckable() ? item->IsChecked() : -1);
 
-            if ( targetWindow->GetEventHandler()->ProcessEvent(event) )
+            if ( targetWindow->HandleWindowEvent(event) )
                 result = noErr ;
         }
     }
     return result;
 }
 
-wxInt32 wxMenu::MacHandleCommandUpdateStatus( wxMenuItem* item, int id, wxWindow* targetWindow )
+wxInt32 wxMenu::MacHandleCommandUpdateStatus(wxMenuItem* WXUNUSED(item),
+                                             int id,
+                                             wxWindow* targetWindow)
 {
     OSStatus result = eventNotHandledErr ;
     wxUpdateUIEvent event(id);
@@ -602,7 +601,7 @@ wxInt32 wxMenu::MacHandleCommandUpdateStatus( wxMenuItem* item, int id, wxWindow
             wxWindow *win = menu->GetInvokingWindow();
             if ( win )
             {
-                processed = win->GetEventHandler()->ProcessEvent(event);
+                processed = win->HandleWindowEvent(event);
                 break;
             }
 
@@ -612,9 +611,9 @@ wxInt32 wxMenu::MacHandleCommandUpdateStatus( wxMenuItem* item, int id, wxWindow
 
     if ( !processed && targetWindow != NULL)
     {
-        processed = targetWindow->GetEventHandler()->ProcessEvent(event);
+        processed = targetWindow->HandleWindowEvent(event);
     }
-    
+
     if ( processed )
     {
         // if anything changed, update the changed attribute
@@ -712,12 +711,7 @@ void wxMenuBar::MacInstallMenuBar()
 
     MenuBarHandle menubar = NULL ;
 
-#if TARGET_API_MAC_OSX
     menubar = NewHandleClear( 6 /* sizeof( MenuBarHeader ) */ ) ;
-#else
-    menubar = NewHandleClear( 12 ) ;
-    (*menubar)[3] = 0x0a ;
-#endif
 
     ::SetMenuBar( menubar ) ;
     DisposeMenuBar( menubar ) ;
@@ -729,10 +723,8 @@ void wxMenuBar::MacInstallMenuBar()
     // Add About/Preferences separator only on OS X
     // KH/RN: Separator is always present on 10.3 but not on 10.2
     // However, the change from 10.2 to 10.3 suggests it is preferred
-#if TARGET_API_MAC_OSX
     InsertMenuItemTextWithCFString( appleMenu,
                 CFSTR(""), 0, kMenuItemAttrSeparator, 0);
-#endif
     InsertMenuItemTextWithCFString( appleMenu,
                 CFSTR("About..."), 0, 0, 0);
     MacInsertMenu( appleMenu , 0 ) ;
@@ -751,8 +743,7 @@ void wxMenuBar::MacInstallMenuBar()
         helpMenuHandle = NULL ;
     }
 
-#if TARGET_CARBON
-    if ( UMAGetSystemVersion() >= 0x1000 && wxApp::s_macPreferencesMenuItemId)
+    if ( wxApp::s_macPreferencesMenuItemId)
     {
         wxMenuItem *item = FindItem( wxApp::s_macPreferencesMenuItemId , NULL ) ;
         if ( item == NULL || !(item->IsEnabled()) )
@@ -765,7 +756,7 @@ void wxMenuBar::MacInstallMenuBar()
     // enabled unless it is added by the application and then disabled, otherwise
     // a program would be required to add an item with wxID_EXIT in order to get the
     // Quit menu item to be enabled, which seems a bit burdensome.
-    if ( UMAGetSystemVersion() >= 0x1000 && wxApp::s_macExitMenuItemId)
+    if ( wxApp::s_macExitMenuItemId)
     {
         wxMenuItem *item = FindItem( wxApp::s_macExitMenuItemId , NULL ) ;
         if ( item != NULL && !(item->IsEnabled()) )
@@ -773,7 +764,6 @@ void wxMenuBar::MacInstallMenuBar()
         else
             EnableMenuCommand( NULL , kHICommandQuit ) ;
     }
-#endif
 
     wxString strippedHelpMenuTitle = wxStripMenuCodes( wxApp::s_macHelpMenuTitleName ) ;
     wxString strippedTranslatedHelpMenuTitle = wxStripMenuCodes( wxString( _("&Help") ) ) ;