/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/menu.h
+// Name: wx/gtk1/menu.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
#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
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);
GtkAccelGroup *m_accel;
- GtkItemFactory *m_factory;
GtkWidget *m_menubar;
long m_style;
wxWindow *m_invokingWindow;
private:
+ void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
+
DECLARE_DYNAMIC_CLASS(wxMenuBar)
};
// wxMenu
//-----------------------------------------------------------------------------
-class wxMenu : public wxMenuBase
+class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase
{
public:
// ctors & dtor
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);
- // 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;
GtkWidget *m_menu; // GtkMenu
GtkWidget *m_owner;
GtkAccelGroup *m_accel;
- GtkItemFactory *m_factory;
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)
};
-#endif // __GTKMENUH__
+#endif
+ // __GTKMENUH__