#ifndef _WX_MOTIF_MENU_H_
#define _WX_MOTIF_MENU_H_
-#ifdef __GNUG__
-#pragma interface "menu.h"
-#endif
-
#include "wx/colour.h"
#include "wx/font.h"
+#include "wx/arrstr.h"
-class wxFrame;
+class WXDLLIMPEXP_CORE wxFrame;
// ----------------------------------------------------------------------------
// Menu
// ----------------------------------------------------------------------------
-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);
virtual void Break();
bool ProcessCommand(wxCommandEvent& event);
- wxMenu(const wxString& title, const wxFunction func)
- : wxMenuBase(title)
- {
- Init();
-
- Callback(func);
- }
-
//// Motif-specific
WXWidget GetButtonWidget() const { return m_buttonWidget; }
void SetButtonWidget(WXWidget buttonWidget) { m_buttonWidget = buttonWidget; }
void HidePopup();
WXWidget CreateMenu(wxMenuBar *menuBar, WXWidget parent, wxMenu *topMenu,
- const wxString& title = wxEmptyString,
- bool isPulldown = FALSE);
+ size_t index, const wxString& title = wxEmptyString,
+ bool isPulldown = false);
// For popups, need to destroy, then recreate menu for a different (or
// possibly same) window, since the parent may change.
void SetBackgroundColour(const wxColour& colour);
void SetForegroundColour(const wxColour& colour);
void SetFont(const wxFont& colour);
- void ChangeFont(bool keepOriginalSize = FALSE);
+ void ChangeFont(bool keepOriginalSize = false);
WXWidget GetHandle() const { return m_menuWidget; }
bool IsTearOff() const { return (m_style & wxMENU_TEAROFF) != 0; }
-
+
+ void DestroyWidgetAndDetach();
public:
// Motif-specific data
int m_numColumns;
// Menu Bar
// ----------------------------------------------------------------------------
-class wxMenuBar : public wxMenuBarBase
+class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase
{
public:
wxMenuBar() { Init(); }
wxMenuBar(long WXUNUSED(style)) { Init(); }
- wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
+ wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
+ wxMenuBar(size_t n, wxMenu *menus[], const wxArrayString& titles, long style = 0);
virtual ~wxMenuBar();
// implement base class (pure) virtuals
virtual bool SetBackgroundColour(const wxColour& colour);
virtual bool SetForegroundColour(const wxColour& colour);
virtual bool SetFont(const wxFont& colour);
- void ChangeFont(bool keepOriginalSize = FALSE);
+ void ChangeFont(bool keepOriginalSize = false);
public:
// common part of all ctors