m_menubar does not need to be public for hildon, it's the same as m_widget in that...

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index 92bb3146d419d50f3bd297e4fcdfe7006e449239..7732a9ab842443e984a3dde3fe54a80d7357ad65 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -48,15 +48,14 @@ public:
     virtual void Attach(wxFrame *frame);
     virtual void Detach();
 
-    // implementation only from now on
-    GtkWidget       *m_menubar; // Public for hildon support
-
 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);
 
+    GtkWidget* m_menubar;
+
     DECLARE_DYNAMIC_CLASS(wxMenuBar)
 };
 

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 421643ddbb3ebc3a175e6aeff9a496208b6c6727..5c20c83f8511cea4f2e2e441a783325b1bfaa701 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -302,7 +302,7 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
     {
 #if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
         hildon_window_set_menu(HILDON_WINDOW(m_widget),
-                               GTK_MENU(m_frameMenuBar->m_menubar));
+                               GTK_MENU(m_frameMenuBar->m_widget));
 #else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
         m_frameMenuBar->SetParent(this);