No real changes, just make wxWindow::CanScroll() virtual.

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

diff --git a/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h
index 565cb5620d55f2fbd192b4643b5988461ee96245..a36b1b2fc7f7cfc0810cd6b35bb7c03dcbbbd1f5 100644 (file)
--- a/include/wx/gtk1/menuitem.h
+++ b/include/wx/gtk1/menuitem.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk1/menuitem.h
 // Purpose:     wxMenuItem class
 // Author:      Robert Roebling
 // Name:        wx/gtk1/menuitem.h
 // Purpose:     wxMenuItem class
 // Author:      Robert Roebling

-// RCS-ID:      $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -19,16 +18,17 @@
 class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase
 {
 public:
 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,
                int id = wxID_SEPARATOR,
                const wxString& text = wxEmptyString,
                const wxString& help = wxEmptyString,
                wxItemKind kind = wxITEM_NORMAL,

-               wxMenu *subMenu = (wxMenu *)NULL);
+               wxMenu *subMenu = NULL);

     virtual ~wxMenuItem();
 
     // implement base class virtuals
     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;
     virtual void Enable( bool enable = TRUE );
     virtual void Check( bool check = TRUE );
     virtual bool IsChecked() const;


@@ -54,7 +54,7 @@ public:
                const wxString& text,
                const wxString& help,
                bool isCheckable,
                const wxString& text,
                const wxString& help,
                bool isCheckable,

-               wxMenu *subMenu = (wxMenu *)NULL);
+               wxMenu *subMenu = NULL);

 
 private:
     // common part of all ctors
 
 private:
     // common part of all ctors


@@ -73,6 +73,5 @@ private:
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 };
 

-

 #endif
         //__GTKMENUITEMH__
 #endif
         //__GTKMENUITEMH__