Implement wxGetHostName() for Windows CE.

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

diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h
index 7ac723e239f6ab9899bb6898ff9fc8479689389a..78d967612ae1ab1d3299e92f656600658e5ccf92 100644 (file)
--- a/include/wx/gtk/menuitem.h
+++ b/include/wx/gtk/menuitem.h
@@ -7,8 +7,8 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKMENUITEMH__
-#define __GTKMENUITEMH__
+#ifndef _WX_GTKMENUITEM_H_
+#define _WX_GTKMENUITEM_H_

 
 #include "wx/bitmap.h"
 
 
 #include "wx/bitmap.h"
 


@@ -19,64 +19,45 @@
 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 Enable( bool enable = TRUE );
-    virtual void Check( bool check = TRUE );
+    virtual void SetItemLabel( const wxString& str );
+    virtual void Enable( bool enable = true );
+    virtual void Check( bool check = true );

     virtual bool IsChecked() const;
     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
     void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
     GtkWidget *GetMenuItem() const { return m_menuItem; }
     // implementation
     void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
     GtkWidget *GetMenuItem() const { return m_menuItem; }

-    GtkWidget *GetLabelWidget() const { return m_labelWidget; }
-    void SetLabelWidget(GtkWidget *labelWidget) { m_labelWidget = labelWidget; }
-    wxString GetFactoryPath() const;
-
-    wxString GetHotKey() const { return m_hotKey; }
-
-    // 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);
+    void SetGtkLabel();

 
 

+#if WXWIN_COMPATIBILITY_2_8

     // compatibility only, don't use in new code
     // compatibility only, don't use in new code

+    wxDEPRECATED(
+    inline

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

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

 
 private:
 
 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_hotKey;

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

-

     GtkWidget *m_menuItem;  // GtkMenuItem
     GtkWidget *m_menuItem;  // GtkMenuItem

-    GtkWidget* m_labelWidget; // Label widget

 
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 };
 
 
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 };
 

-
-#endif
-        //__GTKMENUITEMH__
+#endif // _WX_GTKMENUITEM_H_