cleanup - added whitespace around operators, some blank lines, fixed comment typos...

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index 83376e780b0be44b4a3dbf5881c4207ab747db0b..c72c8ff60dcbe1258a5eb2581fbab4018f932576 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -1,107 +1,99 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKMENUH__
 #define __GTKMENUH__
 
 #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"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxMenuBar;
-class wxMenuItem;
-class wxMenu;
-

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

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMenuBar)
+public:
+    // ctors
+    wxMenuBar();
+    wxMenuBar(long style);
+    wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
+    virtual ~wxMenuBar();
+
+    // 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);
+
+    virtual int FindMenuItem(const wxString& menuString,
+                             const wxString& itemString) const;
+    virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const;
+
+    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 );
+
+    // common part of Append and Insert
+    bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);

 
 

-  public:
+    GtkWidget       *m_menubar;
+    long             m_style;
+    wxWindow        *m_invokingWindow;

 
 

-    wxMenuBar(void);
-    void Append( wxMenu *menu, const wxString &title );
-    int FindMenuItem( const wxString &menuString, const wxString &itemString ) const;
-    
-    wxList       m_menus;
-    GtkWidget   *m_menubar;
+private:
+    void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
+
+    DECLARE_DYNAMIC_CLASS(wxMenuBar)

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

-class wxMenuItem: public wxObject
+class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMenuItem)
-
-  public:
-  
-    wxMenuItem(void);
-  
-    int           m_id;
-    wxString      m_text;
-    bool          m_isCheckMenu;
-    bool          m_checked;
-    bool          m_isSubMenu;
-    bool          m_isEnabled;
-    wxMenu       *m_subMenu;
-    wxString      m_helpStr;
-    
-    GtkWidget    *m_menuItem;  // GtkMenuItem
-  
-};
+public:
+    // ctors & dtor
+    wxMenu(const wxString& title, long style = 0)
+        : wxMenuBase(title, style) { Init(); }

 
 

-class wxMenu: public wxEvtHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxMenu)
-
-  public:
-
-    wxMenu( const wxString &title = "" );
-    void AppendSeparator(void);
-    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 = "" );
-    int FindItem( const wxString itemString ) const;
-    void Break(void) {};
-    void Enable( int id, bool enable );
-    bool Enabled( int id ) const;
-    void SetLabel( int id, const wxString &label );
-
-  public:
-      
+    wxMenu(long style = 0) : wxMenuBase(style) { Init(); }
+
+    virtual ~wxMenu();
+
+    // TODO: virtual void SetTitle(const wxString& title);
+
+    // implementation

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

-    void SetInvokingWindow( wxWindow *win );
-    wxWindow *GetInvokingWindow(void);
-
-    wxString    m_title;
-    wxList      m_items;
-    wxWindow   *m_invokingWindow;
-    
-    GtkWidget  *m_menu;  // GtkMenu
-      
+
+    // implementation GTK only
+    GtkWidget       *m_menu;  // GtkMenu
+    GtkWidget       *m_owner;
+    GtkAccelGroup   *m_accel;
+
+protected:
+    virtual wxMenuItem* DoAppend(wxMenuItem *item);
+    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
+    virtual wxMenuItem* DoRemove(wxMenuItem *item);
+
+private:
+    // 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 // __GTKMENUH__