remove unused wxMenuBar::m_style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -7,8 +7,8 @@
|
|||||||
// Licence: wxWindows licence
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifndef __GTKMENUH__
|
#ifndef _WX_GTKMENU_H_
|
||||||
#define __GTKMENUH__
|
#define _WX_GTKMENU_H_
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// wxMenuBar
|
// wxMenuBar
|
||||||
@@ -50,14 +50,13 @@ public:
|
|||||||
void SetInvokingWindow( wxWindow *win );
|
void SetInvokingWindow( wxWindow *win );
|
||||||
void UnsetInvokingWindow( wxWindow *win );
|
void UnsetInvokingWindow( wxWindow *win );
|
||||||
|
|
||||||
|
private:
|
||||||
// common part of Append and Insert
|
// common part of Append and Insert
|
||||||
bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
|
bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
|
||||||
|
|
||||||
GtkWidget *m_menubar;
|
GtkWidget *m_menubar;
|
||||||
long m_style;
|
|
||||||
wxWindow *m_invokingWindow;
|
wxWindow *m_invokingWindow;
|
||||||
|
|
||||||
private:
|
|
||||||
void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
|
void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
|
||||||
|
|
||||||
DECLARE_DYNAMIC_CLASS(wxMenuBar)
|
DECLARE_DYNAMIC_CLASS(wxMenuBar)
|
||||||
@@ -111,4 +110,4 @@ private:
|
|||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
// __GTKMENUH__
|
// _WX_GTKMENU_H_
|
||||||
|
@@ -102,7 +102,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
|
|||||||
|
|
||||||
void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long style)
|
void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long style)
|
||||||
{
|
{
|
||||||
m_style = style;
|
|
||||||
m_invokingWindow = NULL;
|
m_invokingWindow = NULL;
|
||||||
|
|
||||||
#if wxUSE_LIBHILDON
|
#if wxUSE_LIBHILDON
|
||||||
|
Reference in New Issue
Block a user