Better fix

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

diff --git a/include/wx/univ/menuitem.h b/include/wx/univ/menuitem.h
index 4fe666fc276919c49bd1cf2a70a401db4fde0ca6..3601bd5fc8ba9b2522e0e3c2ab3711bdc55ec550 100644 (file)
--- a/include/wx/univ/menuitem.h
+++ b/include/wx/univ/menuitem.h
@@ -12,10 +12,6 @@
 #ifndef _WX_UNIV_MENUITEM_H_
 #define _WX_UNIV_MENUITEM_H_
 
 #ifndef _WX_UNIV_MENUITEM_H_
 #define _WX_UNIV_MENUITEM_H_
 

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

 // ----------------------------------------------------------------------------
 // wxMenuItem implements wxMenuItemBase
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxMenuItem implements wxMenuItemBase
 // ----------------------------------------------------------------------------


@@ -33,7 +29,7 @@ public:
     virtual ~wxMenuItem();
 
     // override base class virtuals to update the item appearance on screen
     virtual ~wxMenuItem();
 
     // override base class virtuals to update the item appearance on screen

-    virtual void SetText(const wxString& text);
+    virtual void SetItemLabel(const wxString& text);

     virtual void SetCheckable(bool checkable);
 
     virtual void Enable(bool enable = true);
     virtual void SetCheckable(bool checkable);
 
     virtual void Enable(bool enable = true);


@@ -98,7 +94,7 @@ protected:
     // the bitmaps (may be invalid, then they're not used)
     wxBitmap m_bmpChecked,
              m_bmpUnchecked,
     // the bitmaps (may be invalid, then they're not used)
     wxBitmap m_bmpChecked,
              m_bmpUnchecked,

-             m_bmpDisabled; 
+             m_bmpDisabled;

 
     // the positions of the first and last items of the radio group this item
     // belongs to or -1: start is the radio group start and is valid for all
 
     // the positions of the first and last items of the radio group this item
     // belongs to or -1: start is the radio group start and is valid for all