move wxWindowGTK::DoPopupMenu back to window.cpp

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

diff --git a/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h
index 0fb1eed49dc453e4a7fd74b422d9d3a6fab04b05..827cf6e780195e9ba66677f5d1afba51bbe92d78 100644 (file)
--- a/include/wx/gtk1/menuitem.h
+++ b/include/wx/gtk1/menuitem.h
@@ -1,26 +1,22 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        menuitem.h
+// Name:        wx/gtk1/menuitem.h
 // Purpose:     wxMenuItem class
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKMENUITEMH__
 #define __GTKMENUITEMH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "wx/bitmap.h"
 
 //-----------------------------------------------------------------------------
 // wxMenuItem
 //-----------------------------------------------------------------------------
 
-class wxMenuItem : public wxMenuItemBase
+class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase
 {
 public:
     wxMenuItem(wxMenu *parentMenu = (wxMenu *)NULL,
@@ -29,10 +25,11 @@ public:
                const wxString& help = wxEmptyString,
                wxItemKind kind = wxITEM_NORMAL,
                wxMenu *subMenu = (wxMenu *)NULL);
-    ~wxMenuItem();
+    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;
@@ -62,7 +59,7 @@ public:
 
 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__