Update to Scintilla 1.48

[wxWidgets.git] / include / wx / mac / menuitem.h

diff --git a/include/wx/mac/menuitem.h b/include/wx/mac/menuitem.h
index 9011439e22c1ab2622ca2e32ce7ccb7e3b794fbc..459452596103a0cb24b853fc15d9423457724cf1 100644 (file)
--- a/include/wx/mac/menuitem.h
+++ b/include/wx/mac/menuitem.h
@@ -12,7 +12,7 @@
 #ifndef   _MENUITEM_H
 #define   _MENUITEM_H
 
 #ifndef   _MENUITEM_H
 #define   _MENUITEM_H
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "menuitem.h"
 #endif
 
 #pragma interface "menuitem.h"
 #endif
 


@@ -43,7 +43,7 @@ public:
                int id = wxID_SEPARATOR,
                const wxString& name = wxEmptyString,
                const wxString& help = wxEmptyString,
                int id = wxID_SEPARATOR,
                const wxString& name = wxEmptyString,
                const wxString& help = wxEmptyString,

-               wxItemKind kind = wxItem_Normal,
+               wxItemKind kind = wxITEM_NORMAL,

                wxMenu *subMenu = (wxMenu *)NULL);
     virtual ~wxMenuItem();
 
                wxMenu *subMenu = (wxMenu *)NULL);
     virtual ~wxMenuItem();