Compilation fix for non-MSW: don't use ProcessCommand().

[wxWidgets.git] / src / cocoa / menu.mm

diff --git a/src/cocoa/menu.mm b/src/cocoa/menu.mm
index fc5e4b038cfad1667e76852743ee82ac1c58e9fa..4ec58599934388a839ef2e9572c137aa8416a5d2 100644 (file)
--- a/src/cocoa/menu.mm
+++ b/src/cocoa/menu.mm
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/menu.cpp
+// Name:        src/cocoa/menu.cpp

 // Purpose:     wxMenu and wxMenuBar implementation
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/09
 // Purpose:     wxMenu and wxMenuBar implementation
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/09

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) 2002 David Elliott
 // Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2002 David Elliott
 // Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////


@@ -18,8 +18,10 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/wxprec.h"
 // ----------------------------------------------------------------------------
 
 #include "wx/wxprec.h"

+
+#include "wx/menu.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/menu.h"

     #include "wx/log.h"
 #endif // WX_PRECOMP
 
     #include "wx/log.h"
 #endif // WX_PRECOMP
 


@@ -27,7 +29,7 @@
 #include "wx/cocoa/string.h"
 
 #import <Foundation/NSString.h>
 #include "wx/cocoa/string.h"
 
 #import <Foundation/NSString.h>

-#import <AppKit/NSMenu.h>
+#include "wx/cocoa/objc/NSMenu.h"

 
 #if wxUSE_MENUS
 
 
 #if wxUSE_MENUS
 


@@ -44,7 +46,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 bool wxMenu::Create(const wxString& title, long style)
 {
     wxAutoNSAutoreleasePool pool;
 bool wxMenu::Create(const wxString& title, long style)
 {
     wxAutoNSAutoreleasePool pool;

-    m_cocoaNSMenu = [[NSMenu alloc] initWithTitle: wxNSStringWithWxString(title)];
+    m_cocoaNSMenu = [[WX_GET_OBJC_CLASS(WXNSMenu) alloc] initWithTitle: wxNSStringWithWxString(title)];

     AssociateNSMenu(m_cocoaNSMenu);
     return true;
 }
     AssociateNSMenu(m_cocoaNSMenu);
     return true;
 }


@@ -213,11 +215,11 @@ bool wxMenuBar::IsEnabledTop(size_t pos) const
     return false;
 }
 
     return false;
 }
 

-void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
+void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)

 {
 }
 
 {
 }
 

-wxString wxMenuBar::GetLabelTop(size_t pos) const
+wxString wxMenuBar::GetMenuLabel(size_t pos) const

 {
     wxMenu *menu = GetMenu(pos);
     int itemindex = [m_cocoaNSMenu indexOfItemWithSubmenu:menu->GetNSMenu()];
 {
     wxMenu *menu = GetMenu(pos);
     int itemindex = [m_cocoaNSMenu indexOfItemWithSubmenu:menu->GetNSMenu()];