glcanvas fix and toplevel event handler exposed

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

diff --git a/include/wx/motif/menuitem.h b/include/wx/motif/menuitem.h
index c435b612084f9200d09be9c39a186a6293a008ad..2a6cbe3cc88d906dd7fb9ac252b4db26f91de19a 100644 (file)
--- a/include/wx/motif/menuitem.h
+++ b/include/wx/motif/menuitem.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MOTIF_MENUITEM_H
 #define _WX_MOTIF_MENUITEM_H
 
 #ifndef _WX_MOTIF_MENUITEM_H
 #define _WX_MOTIF_MENUITEM_H
 

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

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


@@ -47,8 +47,6 @@ public:
     virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
     virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
     
     virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
     virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
     

-    void DeleteSubMenu();
-    

     // implementation from now on
     void CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMenu);
     void DestroyItem(bool full);
     // implementation from now on
     void CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMenu);
     void DestroyItem(bool full);