From f1a3ae7dc957d3af63f6a7141a7aeaee1ec643f8 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sat, 29 Dec 2012 06:21:01 +0000 Subject: [PATCH] m_menubar does not need to be public for hildon, it's the same as m_widget in that case git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/menu.h | 5 ++--- src/gtk/frame.cpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index 92bb3146d4..7732a9ab84 100644 --- 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 421643ddbb..5c20c83f85 100644 --- 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); -- 2.47.2