no changes, just remove #if'd out code

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

diff --git a/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h
index 790aa6184763255a44875305133099ee2de37862..48b3778e365a038bcd85f44b26dbbcb15c6da9a6 100644 (file)
--- a/include/wx/gtk1/menuitem.h
+++ b/include/wx/gtk1/menuitem.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        menuitem.h
+// Name:        wx/gtk1/menuitem.h
 // Purpose:     wxMenuItem class
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
@@ -10,29 +10,26 @@
 #ifndef __GTKMENUITEMH__
 #define __GTKMENUITEMH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
 #include "wx/bitmap.h"
 
 //-----------------------------------------------------------------------------
 // wxMenuItem
 //-----------------------------------------------------------------------------
 
-class wxMenuItem : public wxMenuItemBase
+class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase
 {
 public:
-    wxMenuItem(wxMenu *parentMenu = (wxMenu *)NULL,
+    wxMenuItem(wxMenu *parentMenu = NULL,
                int id = wxID_SEPARATOR,
                const wxString& text = wxEmptyString,
                const wxString& help = wxEmptyString,
                wxItemKind kind = wxITEM_NORMAL,
-               wxMenu *subMenu = (wxMenu *)NULL);
-    ~wxMenuItem();
+               wxMenu *subMenu = NULL);
+    virtual ~wxMenuItem();
 
     // implement base class virtuals
-    virtual void SetText( const wxString& str );
+    virtual void SetItemLabel( const wxString& str );
+    virtual wxString GetItemLabel() const;
     virtual void Enable( bool enable = TRUE );
     virtual void Check( bool check = TRUE );
     virtual bool IsChecked() const;
@@ -58,11 +55,11 @@ public:
                const wxString& text,
                const wxString& help,
                bool isCheckable,
-               wxMenu *subMenu = (wxMenu *)NULL);
+               wxMenu *subMenu = NULL);
 
 private:
     // common part of all ctors
-    void Init(const wxString& text);
+    void Init();
 
     // DoSetText() transforms the accel mnemonics in our label from MSW/wxWin
     // style to GTK+ and is called from ctor and SetText()
@@ -77,6 +74,5 @@ private:
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 };
 
-
 #endif
         //__GTKMENUITEMH__