made GetColourFromGTKWidget() more general, it is now used for all colours

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

diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp
index 3e6277ac5b38967c371269ee66a201d8fb37ed7d..6956a0987adde5647ae5fdcb9f865e69a8697e6c 100644 (file)
--- a/src/mac/menu.cpp
+++ b/src/mac/menu.cpp
@@ -56,7 +56,7 @@ const short kwxMacAppleMenuId = 1 ;
 
 // Construct a menu with optional title (then use append)
 
 
 // Construct a menu with optional title (then use append)
 

-#ifdef __UNIX__
+#ifdef __DARWIN__

 short wxMenu::s_macNextMenuId = 3 ;
 #else
 short wxMenu::s_macNextMenuId = 2 ;
 short wxMenu::s_macNextMenuId = 3 ;
 #else
 short wxMenu::s_macNextMenuId = 2 ;


@@ -140,7 +140,7 @@ void wxMenu::UpdateAccel(wxMenuItem *item)
         if ( accel )
             m_accels[n] = accel;
         else
         if ( accel )
             m_accels[n] = accel;
         else

-            m_accels.Remove(n);
+            m_accels.RemoveAt(n);

     }
 
     if ( IsAttached() )
     }
 
     if ( IsAttached() )


@@ -269,7 +269,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
     {
         delete m_accels[n];
 
     {
         delete m_accels[n];
 

-        m_accels.Remove(n);
+        m_accels.RemoveAt(n);

     }
     //else: this item doesn't have an accel, nothing to do
 #endif // wxUSE_ACCEL
     }
     //else: this item doesn't have an accel, nothing to do
 #endif // wxUSE_ACCEL


@@ -450,7 +450,7 @@ bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, in
                        return true ;
                }
        }
                        return true ;
                }
        }

-#ifndef __WXMAC_X__
+#ifndef __DARWIN__

        else if ( macMenuId == kHMHelpMenuID )
        {
                int menuItem = formerHelpMenuItems ;
        else if ( macMenuId == kHMHelpMenuID )
        {
                int menuItem = formerHelpMenuItems ;


@@ -499,7 +499,7 @@ bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, in
                        }
          }
        }
                        }
          }
        }

-#endif // __WXMAC_X__
+#endif // __DARWIN__

 
   for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++) 
   {    
 
   for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++) 
   {    


@@ -898,7 +898,7 @@ void wxMenuBar::MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId,
          for (int i = 0; i < m_menus.GetCount() ; i++)
          {
                if ( m_menus[i]->MacGetMenuId() == macMenuId
          for (int i = 0; i < m_menus.GetCount() ; i++)
          {
                if ( m_menus[i]->MacGetMenuId() == macMenuId

-#ifndef __WXMAC_X__
+#ifndef __DARWIN__

                     || 
                        ( macMenuId == kHMHelpMenuID && ( m_titles[i] == "?" || m_titles[i] == "&?"  || m_titles[i] == wxApp::s_macHelpMenuTitleName ) )
 #endif
                     || 
                        ( macMenuId == kHMHelpMenuID && ( m_titles[i] == "?" || m_titles[i] == "&?"  || m_titles[i] == wxApp::s_macHelpMenuTitleName ) )
 #endif