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 bc5c7a8fc382d60c11f8567d890a60f49e5f94fb..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


@@ -32,26 +31,17 @@ public:
     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;

-    virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
+    virtual void SetBitmap(const wxBitmap& bitmap);

     virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
 
     virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
 

-#if wxUSE_ACCEL
-    virtual wxAcceleratorEntry *GetAccel() const;
-#endif // wxUSE_ACCEL
-

     // implementation
     // implementation

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

     GtkWidget *GetMenuItem() const { return m_menuItem; }
     GtkWidget *GetMenuItem() const { return m_menuItem; }

-
-    // splits given string in the label, doing & => _ translation, which is returned,
-    // and in the hotkey which is used to set given pointer
-    static wxString GTKProcessMenuItemLabel(const wxString& str, wxString *hotKey);
-
-    wxString GetGtkItemLabel() { return m_gtkText; }
+    void SetGtkLabel();

 
 #if WXWIN_COMPATIBILITY_2_8
     // compatibility only, don't use in new code
 
 #if WXWIN_COMPATIBILITY_2_8
     // compatibility only, don't use in new code

-    wxDEPRECATED(
+    wxDEPRECATED_CONSTRUCTOR(

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


@@ -62,17 +52,7 @@ public:
 #endif
 
 private:
 #endif
 
 private:

-    // common part of all ctors
-    void Init(const wxString& text);
-
-    // DoSetText() transforms the accel mnemonics in our label from MSW/wxWin
-    // style to GTK+ and is called from ctor and SetText()
-    void DoSetText(const wxString& text);
-
-    wxString  m_gtkText; // m_text after conversion to GTK mnemonics
-    wxString  m_hotKey;

     wxBitmap  m_bitmap; // Bitmap for menuitem, if any
     wxBitmap  m_bitmap; // Bitmap for menuitem, if any

-

     GtkWidget *m_menuItem;  // GtkMenuItem
 
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
     GtkWidget *m_menuItem;  // GtkMenuItem
 
     DECLARE_DYNAMIC_CLASS(wxMenuItem)