removed separate wxSYS_ICONTITLE_FONT; made it the same as wxSYS_DEFAULT_GUI_FONT

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index f482d01644315675b1a52fb72dff2663b909765e..123f23b86b58c9c8c18856eb0cf66091b9f122c0 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -48,8 +48,9 @@ public:
     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title);
 
     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title);
 

+#ifndef __WXGTK20__

     GtkAccelGroup   *m_accel;
     GtkAccelGroup   *m_accel;

-    GtkItemFactory  *m_factory;
+#endif

     GtkWidget       *m_menubar;
     long             m_style;
     wxWindow        *m_invokingWindow;
     GtkWidget       *m_menubar;
     long             m_style;
     wxWindow        *m_invokingWindow;


@@ -74,9 +75,9 @@ public:
     virtual ~wxMenu();
 
     // implement base class virtuals
     virtual ~wxMenu();
 
     // implement base class virtuals

-    virtual bool DoAppend(wxMenuItem *item);
-    virtual bool DoInsert(size_t pos, wxMenuItem *item);
-    virtual wxMenuItem *DoRemove(wxMenuItem *item);
+    virtual wxMenuItem* DoAppend(wxMenuItem *item);
+    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
+    virtual wxMenuItem* DoRemove(wxMenuItem *item);

 
     // TODO: virtual void SetTitle(const wxString& title);
 
 
     // TODO: virtual void SetTitle(const wxString& title);
 


@@ -87,7 +88,6 @@ public:
     GtkWidget       *m_menu;  // GtkMenu
     GtkWidget       *m_owner;
     GtkAccelGroup   *m_accel;
     GtkWidget       *m_menu;  // GtkMenu
     GtkWidget       *m_owner;
     GtkAccelGroup   *m_accel;

-    GtkItemFactory  *m_factory;

 
 private:
     // common code for all constructors:
 
 private:
     // common code for all constructors:


@@ -96,9 +96,7 @@ private:
     // common part of Append and Insert
     bool GtkAppend(wxMenuItem *item);
 
     // common part of Append and Insert
     bool GtkAppend(wxMenuItem *item);
 

-    // if the last menu item was a radio one, this field contains its path,
-    // otherwise it is empty
-    wxString m_pathLastRadio;
+       GtkWidget *m_prevRadio;

 
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };