don't hardcode 16/32 as sizes for small/normal icons (fixes bug 1862812)

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

diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h
index 1fdaa5686a93664ce621a0ac9308bbff3c229fe7..67e4bc8dd3abc2de29687bdf447458812e0de9c8 100644 (file)
--- a/include/wx/msw/menuitem.h
+++ b/include/wx/msw/menuitem.h
@@ -12,10 +12,6 @@
 #ifndef   _MENUITEM_H
 #define   _MENUITEM_H
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "menuitem.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -44,7 +40,7 @@ public:
     virtual ~wxMenuItem();
 
     // override base class virtuals
-    virtual void SetText(const wxString& strName);
+    virtual void SetItemLabel(const wxString& strName);
     virtual void SetCheckable(bool checkable);
 
     virtual void Enable(bool bDoEnable = true);
@@ -57,8 +53,11 @@ public:
 
     // the id for a popup menu is really its menu handle (as required by
     // ::AppendMenu() API), so this function will return either the id or the
-    // menu handle depending on what we're
-    int GetRealId() const;
+    // menu handle depending on what we are
+    //
+    // notice that it also returns the id as an unsigned int, as required by
+    // Win32 API
+    unsigned GetMSWId() const;
 
     // mark item as belonging to the given radio group
     void SetAsRadioGroupStart();