use GetText() instead of GetText(wxString&), made some methods inline

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

diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp
index 099f196f34eb0110bc9ae1f93128302cdd02dfc4..fe599686ad797fa6ca6bf9be0c081736ad14c613 100644 (file)
--- a/src/mac/menu.cpp
+++ b/src/mac/menu.cpp
@@ -22,8 +22,10 @@
 #pragma implementation "menuitem.h"
 #endif
 
+#include "wx/app.h"
 #include "wx/menu.h"
 #include "wx/menuitem.h"
+#include "wx/window.h"
 #include "wx/log.h"
 #include "wx/utils.h"
 
@@ -54,7 +56,11 @@ const short kwxMacAppleMenuId = 1 ;
 
 // Construct a menu with optional title (then use append)
 
+#ifdef __UNIX__
+short wxMenu::s_macNextMenuId = 3 ;
+#else
 short wxMenu::s_macNextMenuId = 2 ;
+#endif
 
 void wxMenu::Init()
 {
@@ -362,7 +368,7 @@ wxWindow *wxMenu::GetWindow() const
     if ( m_invokingWindow != NULL )
         return m_invokingWindow;
     else if ( m_menuBar != NULL)
-        return m_menuBar->GetFrame();
+        return (wxWindow *) m_menuBar->GetFrame();
 
     return NULL;
 }
@@ -460,6 +466,7 @@ bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, in
                        return true ;
                }
        }
+#ifndef __WXMAC_X__
        else if ( macMenuId == kHMHelpMenuID )
        {
                int menuItem = formerHelpMenuItems ;
@@ -508,6 +515,7 @@ bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, in
                        }
          }
        }
+#endif // __WXMAC_X__
 
   for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++) 
   {    
@@ -627,6 +635,9 @@ void wxMenuBar::RebuildAccelTable()
 
 void wxMenuBar::MacInstallMenuBar() 
 {
+       if ( s_macInstalledMenuBar == this )
+               return ;
+               
        Handle menubar = ::GetNewMBar( kwxMacMenuBarResource ) ;
        wxString message ;
        wxCHECK_RET( menubar != NULL, "can't read MBAR resource" );
@@ -902,8 +913,11 @@ void wxMenuBar::MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId,
        {               
          for (int i = 0; i < m_menus.GetCount() ; i++)
          {
-               if ( m_menus[i]->MacGetMenuId() == macMenuId || 
+               if ( m_menus[i]->MacGetMenuId() == macMenuId
+#ifndef __WXMAC_X__
+                    || 
                        ( macMenuId == kHMHelpMenuID && ( m_titles[i] == "?" || m_titles[i] == "&?"  || m_titles[i] == wxApp::s_macHelpMenuTitleName ) )
+#endif
                        )
                {
                        if ( m_menus[i]->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) )