wxGTK::wxSpinCtrl API synchronised with wxMSW

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

diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index c4398fa1687ca4ed32e399d79c0cb89368eee7f4..b51e7e5230e353f4f44829de1b0737fe2e68e81c 100644 (file)
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        menu.h
+// Name:        wx/gtk/menu.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,100 +7,56 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKMENUH__
 #define __GTKMENUH__
 
 #ifdef __GNUG__
 #ifndef __GTKMENUH__
 #define __GTKMENUH__
 
 #ifdef __GNUG__

-#pragma interface
+    #pragma interface "menu.h"

 #endif
 
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/window.h"
-#include "wx/menuitem.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxMenuBar;
-class wxMenuItem;
-class wxMenu;
-
-//-----------------------------------------------------------------------------
-// const
-//-----------------------------------------------------------------------------
-
-#define   ID_SEPARATOR    (-1)
-

 //-----------------------------------------------------------------------------
 // wxMenuBar
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxMenuBar
 //-----------------------------------------------------------------------------
 

-class wxMenuBar : public wxWindow
+class wxMenuBar : public wxMenuBarBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxMenuBar)
-

 public:
     // ctors
     wxMenuBar();
     wxMenuBar(long style);
     wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
 public:
     // ctors
     wxMenuBar();
     wxMenuBar(long style);
     wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);

-    ~wxMenuBar();
+    virtual ~wxMenuBar();

 
 

-    // menubar construction
-    void Append( wxMenu *menu, const wxString &title );
+    // implement base class (pure) virtuals
+    virtual bool Append( wxMenu *menu, const wxString &title );
+    virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title);
+    virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title);
+    virtual wxMenu *Remove(size_t pos);

 
 

-    // item search
-        // by menu and item names, returns wxNOT_FOUND if not found

     virtual int FindMenuItem(const wxString& menuString,
                              const wxString& itemString) const;
     virtual int FindMenuItem(const wxString& menuString,
                              const wxString& itemString) const;

-        // returns NULL if not found
-    wxMenuItem* FindItem( int id ) const;
-        // returns NULL if not found, fills menuForItem if !NULL
-    wxMenuItem *FindItemForId(int itemId, wxMenu **menuForItem = NULL) const;
+    virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const;

 
 

-    // state control
-    void Check( int id, bool check );
-    bool IsChecked( int id ) const;
-    void Enable( int id, bool enable );
-    bool IsEnabled( int id ) const;
-
-    void SetLabel( int id, const wxString &label );
-    wxString GetLabel( int id ) const;
-    wxString GetLabel() const                { return wxWindow::GetLabel(); }
-
-    void EnableTop( int pos, bool flag );
-    void SetLabelTop( int pos, const wxString& label );
-    wxString GetLabelTop( int pos ) const;
-
-    virtual void SetHelpString( int id, const wxString& helpString );
-    virtual wxString GetHelpString( int id ) const;
-
-    int GetMenuCount() const { return m_menus.Number(); }
-    wxMenu *GetMenu( int n ) const { return (wxMenu *)m_menus.Nth(n)->Data(); }
-
-#ifdef WXWIN_COMPATIBILITY
-    // compatibility: these functions are deprecated
-    bool Enabled(int id) const { return IsEnabled(id); }
-    bool Checked(int id) const { return IsChecked(id); }
-
-    wxMenuItem* FindMenuItemById( int id ) const { return FindItem(id); }
-#endif // WXWIN_COMPATIBILITY
-
-    // implementation only
-    wxList& GetMenus() { return m_menus; }
+    virtual void EnableTop( size_t pos, bool flag );
+    virtual void SetLabelTop( size_t pos, const wxString& label );
+    virtual wxString GetLabelTop( size_t pos ) const;

 
 

+    // implementation only from now on

     void SetInvokingWindow( wxWindow *win );
     void UnsetInvokingWindow( wxWindow *win );
 
     GtkAccelGroup   *m_accel;
     GtkItemFactory  *m_factory;
     void SetInvokingWindow( wxWindow *win );
     void UnsetInvokingWindow( wxWindow *win );
 
     GtkAccelGroup   *m_accel;
     GtkItemFactory  *m_factory;

-    wxList           m_menus;

     GtkWidget       *m_menubar;
     long             m_style;
     GtkWidget       *m_menubar;
     long             m_style;

+    wxWindow        *m_invokingWindow;
+
+#if 0 // seems to be unused (VZ)
+    wxMenuList& GetMenus() { return m_menus; }
+#endif // 0
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxMenuBar)

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -112,12 +68,14 @@ class wxMenu : public wxEvtHandler
     DECLARE_DYNAMIC_CLASS(wxMenu)
 
 public:
     DECLARE_DYNAMIC_CLASS(wxMenu)
 
 public:

-#ifdef WXWIN_COMPATIBILITY

     wxMenu( const wxString& title, const wxFunction func)
     {
         Init(title, 0, func);
     }
     wxMenu( const wxString& title, const wxFunction func)
     {
         Init(title, 0, func);
     }

-#endif
+    wxMenu( long style )
+    {
+        Init( wxEmptyString, style );
+    }

     wxMenu( const wxString& title = wxEmptyString, long style = 0 )
     {
         Init(title, style);
     wxMenu( const wxString& title = wxEmptyString, long style = 0 )
     {
         Init(title, style);


@@ -125,11 +83,11 @@ public:
 
     ~wxMenu();
 
 
     ~wxMenu();
 

-    // operations
-        // title
+    // title

     void SetTitle(const wxString& label);
     const wxString GetTitle() const;
     void SetTitle(const wxString& label);
     const wxString GetTitle() const;

-        // menu creation
+
+    // menu creation

     void AppendSeparator();
     void Append(int id, const wxString &item,
                 const wxString &helpStr = "", bool checkable = FALSE);
     void AppendSeparator();
     void Append(int id, const wxString &item,
                 const wxString &helpStr = "", bool checkable = FALSE);


@@ -138,6 +96,9 @@ public:
     void Append(wxMenuItem *pItem);
     void Break() { }
 
     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;
     // find item by name/id
     int FindItem( const wxString itemString ) const;
     wxMenuItem *FindItem( int id ) const;


@@ -172,15 +133,16 @@ public:
 
     wxMenuItem *FindItemForId( int id ) const { return FindItem( id ); }
 
 
     wxMenuItem *FindItemForId( int id ) const { return FindItem( id ); }
 

-#ifdef WXWIN_COMPATIBILITY

     wxFunction GetCallback() const { return m_callback; }
     void Callback(const wxFunction func) { m_callback = func; }
     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); }
 
 
     // compatibility: these functions are deprecated
     bool Enabled(int id) const { return IsEnabled(id); }
     bool Checked(int id) const { return IsChecked(id); }
 

-    wxFunction m_callback;

 #endif // WXWIN_COMPATIBILITY
 
     // implementation
 #endif // WXWIN_COMPATIBILITY
 
     // implementation


@@ -200,11 +162,8 @@ public:
 private:
     // common code for both constructors:
     void Init( const wxString& title,
 private:
     // common code for both constructors:
     void Init( const wxString& title,

-               long style
-#ifdef WXWIN_COMPATIBILITY
-               , const wxFunction func = (wxFunction) NULL
-#endif
-               );
+               long style,
+               const wxFunction func = (wxFunction) NULL );

 
     wxString       m_title;
     wxList         m_items;
 
     wxString       m_title;
     wxList         m_items;