remove unused wxMenuBar::m_style

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index eda3f5a5b16c6f67654afc84d5280afd4c5eb12f..d9e4e33ac9d240bd9dd6605030b63842a8358397 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -7,8 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKMENUH__
-#define __GTKMENUH__
+#ifndef _WX_GTKMENU_H_
+#define _WX_GTKMENU_H_
 
 //-----------------------------------------------------------------------------
 // wxMenuBar
@@ -50,14 +50,13 @@ public:
     void SetInvokingWindow( wxWindow *win );
     void UnsetInvokingWindow( wxWindow *win );
 
+private:
     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
 
     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)
@@ -111,4 +110,4 @@ private:
 };
 
 #endif
-    // __GTKMENUH__
+    // _WX_GTKMENU_H_

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 2e2e0fda3fdff9f54bd58fb63f50e37215d8c2d6..ab5eb3007347c2db0b2ae974f2944af401171a07 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -102,7 +102,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
 
 void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long style)
 {
-    m_style = style;
     m_invokingWindow = NULL;
 
 #if wxUSE_LIBHILDON