no changes, just remove #if'd out code

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index c4398fa1687ca4ed32e399d79c0cb89368eee7f4..63692e98b02d0db1e984cea8e94ac139c645cd53 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/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,211 +7,105 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifndef __GTKMENUH__
-#define __GTKMENUH__
-
-#ifdef __GNUG__
-#pragma interface
-#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)
+#ifndef _WX_GTKMENU_H_
+#define _WX_GTKMENU_H_

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

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

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxMenuBar)
-

 public:
     // ctors
     wxMenuBar();
     wxMenuBar(long style);
 public:
     // ctors
     wxMenuBar();
     wxMenuBar(long style);

-    wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
-    ~wxMenuBar();
+    wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
+    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;
-
-    // state control
-    void Check( int id, bool check );
-    bool IsChecked( int id ) const;
-    void Enable( int id, bool enable );
-    bool IsEnabled( int id ) const;
+    virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const;

 
 

-    void SetLabel( int id, const wxString &label );
-    wxString GetLabel( int id ) const;
-    wxString GetLabel() const                { return wxWindow::GetLabel(); }
+    virtual void EnableTop( size_t pos, bool flag );
+    virtual void SetMenuLabel( size_t pos, const wxString& label );
+    virtual wxString GetMenuLabel( size_t pos ) const;

 
 

-    void EnableTop( int pos, bool flag );
-    void SetLabelTop( int pos, const wxString& label );
-    wxString GetLabelTop( int pos ) const;
+    void SetLayoutDirection(wxLayoutDirection dir);
+    wxLayoutDirection GetLayoutDirection() const;

 
 

-    virtual void SetHelpString( int id, const wxString& helpString );
-    virtual wxString GetHelpString( int id ) const;
+    // wxMenuBar is not a top level window but it still doesn't need a parent
+    // window
+    virtual bool GTKNeedsParent() const { return false; }

 
 

-    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; }
+    void Attach(wxFrame *frame);

 
 

+    // implementation only from now on

     void SetInvokingWindow( wxWindow *win );
     void UnsetInvokingWindow( wxWindow *win );
 
     void SetInvokingWindow( wxWindow *win );
     void UnsetInvokingWindow( wxWindow *win );
 

-    GtkAccelGroup   *m_accel;
-    GtkItemFactory  *m_factory;
-    wxList           m_menus;
+private:
+    // common part of Append and Insert
+    bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
+

     GtkWidget       *m_menubar;
     GtkWidget       *m_menubar;

-    long             m_style;
+    wxWindow        *m_invokingWindow;
+
+    void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
+
+    DECLARE_DYNAMIC_CLASS(wxMenuBar)

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

-class wxMenu : public wxEvtHandler
+class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxMenu)
-

 public:
 public:

-#ifdef WXWIN_COMPATIBILITY
-    wxMenu( const wxString& title, const wxFunction func)
-    {
-        Init(title, 0, func);
-    }
-#endif
-    wxMenu( const wxString& title = wxEmptyString, long style = 0 )
-    {
-        Init(title, style);
-    }
-
-    ~wxMenu();
-
-    // operations
-        // 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() { }
-
-    // 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 ); }
-
-#ifdef WXWIN_COMPATIBILITY
-    wxFunction GetCallback() const { return m_callback; }
-    void Callback(const wxFunction func) { m_callback = func; }
-
-    // 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
-    int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
-    void SetInvokingWindow( wxWindow *win );
-    wxWindow *GetInvokingWindow();
+    // ctors & dtor
+    wxMenu(const wxString& title, long style = 0)
+        : wxMenuBase(title, style) { Init(); }
+
+    wxMenu(long style = 0) : wxMenuBase(style) { Init(); }
+
+    virtual ~wxMenu();
+
+    void Attach(wxMenuBarBase *menubar);
+
+    void SetLayoutDirection(const wxLayoutDirection dir);
+    wxLayoutDirection GetLayoutDirection() const;
+
+    // TODO: virtual void SetTitle(const wxString& title);

 
     // implementation GTK only
     GtkWidget       *m_menu;  // GtkMenu
     GtkWidget       *m_owner;
     GtkAccelGroup   *m_accel;
 
     // implementation GTK only
     GtkWidget       *m_menu;  // GtkMenu
     GtkWidget       *m_owner;
     GtkAccelGroup   *m_accel;

-    GtkItemFactory  *m_factory;
+    bool m_popupShown;

 
 

-    // used by wxMenuBar
-    long GetStyle(void) const { return m_style; }
+protected:
+    virtual wxMenuItem* DoAppend(wxMenuItem *item);
+    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
+    virtual wxMenuItem* DoRemove(wxMenuItem *item);

 
 private:
 
 private:

-    // common code for both constructors:
-    void Init( const wxString& title,
-               long style
-#ifdef WXWIN_COMPATIBILITY
-               , const wxFunction func = (wxFunction) NULL
-#endif
-               );
-
-    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__
+#endif
+    // _WX_GTKMENU_H_