Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h
index fc60a7d3e6dd4bce95e2c4d4438b7edd1923d99c..c17ad03a97804da3f4510d24d368194af77b5c39 100644 (file)
--- a/include/wx/gtk/menuitem.h
+++ b/include/wx/gtk/menuitem.h
@@ -1,8 +1,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        menuitem.h
+// Name:        wx/gtk/menuitem.h

 // Purpose:     wxMenuItem class
 // Author:      Robert Roebling
 // 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,12 +18,12 @@
 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


@@ -36,14 +35,13 @@ public:
     virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
 
     // implementation
     virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
 
     // implementation

-    void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
+    void SetMenuItem(GtkWidget *menuItem);

     GtkWidget *GetMenuItem() const { return m_menuItem; }
     void SetGtkLabel();
 
 #if WXWIN_COMPATIBILITY_2_8
     // compatibility only, don't use in new code
     GtkWidget *GetMenuItem() const { return m_menuItem; }
     void SetGtkLabel();
 
 #if WXWIN_COMPATIBILITY_2_8
     // compatibility only, don't use in new code

-    wxDEPRECATED(
-    inline
+    wxDEPRECATED_CONSTRUCTOR(

     wxMenuItem(wxMenu *parentMenu,
                int id,
                const wxString& text,
     wxMenuItem(wxMenu *parentMenu,
                int id,
                const wxString& text,