wxWinCE fixes.

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index ee22d137b9ea1505fddc30c812e8b0e3f0da2fdb..a154a64e21491990b5e7c896e3c4a558982c44e6 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -10,7 +10,7 @@
 #ifndef __GTKMENUH__
 #define __GTKMENUH__
 
 #ifndef __GTKMENUH__
 #define __GTKMENUH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "menu.h"
 #endif
 
     #pragma interface "menu.h"
 #endif
 


@@ -46,10 +46,11 @@ public:
     void UnsetInvokingWindow( wxWindow *win );
 
     // common part of Append and Insert
     void UnsetInvokingWindow( wxWindow *win );
 
     // common part of Append and Insert

-    bool GtkAppend(wxMenu *menu, const wxString& title);
+    bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);

 
 

+#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,23 +75,12 @@ 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);
 

-    // compatibility only
-#if wxUSE_MENU_CALLBACK
-    wxMenu(const wxString& title, const wxFunction func)
-        : wxMenuBase(title)
-    {
-        Init();
-
-        Callback(func);
-    }
-#endif // WXWIN_COMPATIBILITY_2
-

     // implementation
     int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
 
     // implementation
     int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
 


@@ -98,18 +88,15 @@ 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:
     void Init();
 
 
 private:
     // common code for all constructors:
     void Init();
 

-    // common part of Append and Insert
-    bool GtkAppend(wxMenuItem *item);
+    // common part of Append (if pos == -1)  and Insert
+    bool GtkAppend(wxMenuItem *item, int pos=-1);

 
 

-    // 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)
 };