wxTinderbox build fix (!PCH support).

[wxWidgets.git] / include / wx / mac / carbon / menu.h

diff --git a/include/wx/mac/carbon/menu.h b/include/wx/mac/carbon/menu.h
index b23e612dc93ae0eb8beecfb04273d5c73d2270d9..4430389dec8ad1f3a888b19187d557a6444c1da2 100644 (file)
--- a/include/wx/mac/carbon/menu.h
+++ b/include/wx/mac/carbon/menu.h
@@ -12,10 +12,6 @@
 #ifndef _WX_MENU_H_
 #define _WX_MENU_H_
 
 #ifndef _WX_MENU_H_
 #define _WX_MENU_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "menu.h"
-#endif
-

 class WXDLLEXPORT wxFrame;
 
 #include "wx/arrstr.h"
 class WXDLLEXPORT wxFrame;
 
 #include "wx/arrstr.h"


@@ -35,10 +31,6 @@ public:
 
     virtual ~wxMenu();
 
 
     virtual ~wxMenu();
 

-    // implement base class virtuals
-    virtual wxMenuItem* DoAppend(wxMenuItem *item);
-    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
-    virtual wxMenuItem* DoRemove(wxMenuItem *item);

     virtual void Attach(wxMenuBarBase *menubar) ;
 
     virtual void Break();
     virtual void Attach(wxMenuBarBase *menubar) ;
 
     virtual void Break();


@@ -69,6 +61,11 @@ public:
 
     short MacGetMenuId() { return m_macMenuId ; }
 
 
     short MacGetMenuId() { return m_macMenuId ; }
 

+protected:
+    virtual wxMenuItem* DoAppend(wxMenuItem *item);
+    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
+    virtual wxMenuItem* DoRemove(wxMenuItem *item);
+

 private:
     // common part of all ctors
     void Init();
 private:
     // common part of all ctors
     void Init();