69384772ac
The mnemonics conversion was not done correctly when the menu title contained them but the menu hadn't been appended to the menu bar yet. Closes #15461. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
111 lines
3.4 KiB
C++
111 lines
3.4 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gtk/menu.h
|
|
// Purpose:
|
|
// Author: Robert Roebling
|
|
// Copyright: (c) 1998 Robert Roebling, Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GTKMENU_H_
|
|
#define _WX_GTKMENU_H_
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxMenuBar
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase
|
|
{
|
|
public:
|
|
// ctors
|
|
wxMenuBar();
|
|
wxMenuBar(long style);
|
|
wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
|
|
~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 bool IsEnabledTop(size_t pos) const;
|
|
virtual void SetMenuLabel( size_t pos, const wxString& label );
|
|
virtual wxString GetMenuLabel( size_t pos ) const;
|
|
|
|
void SetLayoutDirection(wxLayoutDirection dir);
|
|
wxLayoutDirection GetLayoutDirection() const;
|
|
|
|
virtual void Attach(wxFrame *frame);
|
|
virtual void Detach();
|
|
|
|
private:
|
|
// common part of Append and Insert
|
|
void GtkAppend(wxMenu* menu, const wxString& title, int pos = -1);
|
|
|
|
void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
|
|
|
|
// wxMenuBar is not a top level window but it still doesn't need a parent
|
|
// window
|
|
virtual bool GTKNeedsParent() const { return false; }
|
|
|
|
GtkWidget* m_menubar;
|
|
|
|
DECLARE_DYNAMIC_CLASS(wxMenuBar)
|
|
};
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxMenu
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase
|
|
{
|
|
public:
|
|
// 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;
|
|
|
|
// Returns the title, with mnemonics translated to wx format
|
|
wxString GetTitle() const;
|
|
|
|
// Sets the title, with mnemonics translated to gtk format
|
|
virtual void SetTitle(const wxString& title);
|
|
|
|
// implementation GTK only
|
|
GtkWidget *m_menu; // GtkMenu
|
|
GtkWidget *m_owner;
|
|
GtkAccelGroup *m_accel;
|
|
bool m_popupShown;
|
|
|
|
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
|
|
void GtkAppend(wxMenuItem* item, int pos = -1);
|
|
|
|
|
|
DECLARE_DYNAMIC_CLASS(wxMenu)
|
|
};
|
|
|
|
#endif
|
|
// _WX_GTKMENU_H_
|