X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3dfac9707a98b245370bdffdf3fd30def0122a8d..2f4f6de77b28416db135359b824ec6d3c0f678fb:/include/wx/gtk1/menu.h?ds=sidebyside

diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index b51e7e5230..afc6828886 100644
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/menu.h
+// Name:        wx/gtk1/menu.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -10,21 +10,17 @@
 #ifndef __GTKMENUH__
 #define __GTKMENUH__
 
-#ifdef __GNUG__
-    #pragma interface "menu.h"
-#endif
-
 //-----------------------------------------------------------------------------
 // wxMenuBar
 //-----------------------------------------------------------------------------
 
-class wxMenuBar : public wxMenuBarBase
+class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase
 {
 public:
     // ctors
     wxMenuBar();
     wxMenuBar(long style);
-    wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
+    wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
     virtual ~wxMenuBar();
 
     // implement base class (pure) virtuals
@@ -45,17 +41,17 @@ public:
     void SetInvokingWindow( wxWindow *win );
     void UnsetInvokingWindow( wxWindow *win );
 
+    // common part of Append and Insert
+    bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
+
     GtkAccelGroup   *m_accel;
-    GtkItemFactory  *m_factory;
     GtkWidget       *m_menubar;
     long             m_style;
     wxWindow        *m_invokingWindow;
 
-#if 0 // seems to be unused (VZ)
-    wxMenuList& GetMenus() { return m_menus; }
-#endif // 0
-
 private:
+    void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
+
     DECLARE_DYNAMIC_CLASS(wxMenuBar)
 };
 
@@ -63,114 +59,42 @@ private:
 // wxMenu
 //-----------------------------------------------------------------------------
 
-class wxMenu : public wxEvtHandler
+class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase
 {
-    DECLARE_DYNAMIC_CLASS(wxMenu)
-
 public:
-    wxMenu( const wxString& title, const wxFunction func)
-    {
-        Init(title, 0, func);
-    }
-    wxMenu( long style )
-    {
-        Init( wxEmptyString, style );
-    }
-    wxMenu( const wxString& title = wxEmptyString, long style = 0 )
-    {
-        Init(title, style);
-    }
-
-    ~wxMenu();
-
-    // title
-    void SetTitle(const wxString& label);
-    const wxString GetTitle() const;
-
-    // menu creation
-    void AppendSeparator();
-    void Append(int id, const wxString &item,
-                const wxString &helpStr = "", bool checkable = FALSE);
-    void Append(int id, const wxString &item,
-                wxMenu *subMenu, const wxString &helpStr = "" );
-    void Append(wxMenuItem *pItem);
-    void Break() { }
-
-    // delete item. don't delete the wxMenu if it's a submenu
-    void Delete( int id );
-
-    // find item by name/id
-    int FindItem( const wxString itemString ) const;
-    wxMenuItem *FindItem( int id ) const;
-
-    // get/set item's state
-    void Enable( int id, bool enable );
-    bool IsEnabled( int id ) const;
-    void Check( int id, bool check );
-    bool IsChecked( int id ) const;
-
-    void SetLabel( int id, const wxString &label );
-    wxString GetLabel( int id ) const;
-
-        // helpstring
-    virtual void SetHelpString(int id, const wxString& helpString);
-    virtual wxString GetHelpString(int id) const ;
-
-        // accessors
-    wxList& GetItems() { return m_items; }
-
-    void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
-    wxEvtHandler *GetEventHandler() { return m_eventHandler; }
-
-    void SetClientData( void* clientData ) { m_clientData = clientData; }
-    void* GetClientData() const { return m_clientData; }
-
-    // Updates the UI for a menu and all submenus recursively.
-    // source is the object that has the update event handlers
-    // defined for it. If NULL, the menu or associated window
-    // will be used.
-    void UpdateUI(wxEvtHandler* source = (wxEvtHandler*) NULL);
-
-    wxMenuItem *FindItemForId( int id ) const { return FindItem( id ); }
-
-    wxFunction GetCallback() const { return m_callback; }
-    void Callback(const wxFunction func) { m_callback = func; }
-    wxFunction m_callback;
-
-#ifdef WXWIN_COMPATIBILITY
-
-    // compatibility: these functions are deprecated
-    bool Enabled(int id) const { return IsEnabled(id); }
-    bool Checked(int id) const { return IsChecked(id); }
-
-#endif // WXWIN_COMPATIBILITY
+    // ctors & dtor
+    wxMenu(const wxString& title, long style = 0)
+        : wxMenuBase(title, style) { Init(); }
+
+    wxMenu(long style = 0) : wxMenuBase(style) { Init(); }
+
+    virtual ~wxMenu();
+
+    // implement base class virtuals
+    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);
 
     // implementation
     int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
-    void SetInvokingWindow( wxWindow *win );
-    wxWindow *GetInvokingWindow();
 
     // implementation GTK only
     GtkWidget       *m_menu;  // GtkMenu
     GtkWidget       *m_owner;
     GtkAccelGroup   *m_accel;
-    GtkItemFactory  *m_factory;
-
-    // used by wxMenuBar
-    long GetStyle(void) const { return m_style; }
 
 private:
-    // common code for both constructors:
-    void Init( const wxString& title,
-               long style,
-               const wxFunction func = (wxFunction) NULL );
-
-    wxString       m_title;
-    wxList         m_items;
-    wxWindow      *m_invokingWindow;
-    wxEvtHandler  *m_eventHandler;
-    void          *m_clientData;
-    long           m_style;
+    // common code for all constructors:
+    void Init();
+
+    // common part of Append (if pos == -1)  and Insert
+    bool GtkAppend(wxMenuItem *item, int pos=-1);
+
+	GtkWidget *m_prevRadio;
+
+    DECLARE_DYNAMIC_CLASS(wxMenu)
 };
 
 #endif // __GTKMENUH__