Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-12-29 06:21:01 +00:00
parent dec0a353ff
commit f1a3ae7dc9
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/gtk/menu.h
View File

@@ -48,15 +48,14 @@ public:
virtual void Attach(wxFrame *frame); virtual void Attach(wxFrame *frame);
virtual void Detach(); virtual void Detach();
// implementation only from now on
GtkWidget *m_menubar; // Public for hildon support
private: private:
// common part of Append and Insert // common part of Append and Insert
void GtkAppend(wxMenu* menu, const wxString& title, int pos = -1); void GtkAppend(wxMenu* menu, const wxString& title, int pos = -1);
void Init(size_t n, wxMenu *menus[], const wxString titles[], long style); void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
GtkWidget* m_menubar;
DECLARE_DYNAMIC_CLASS(wxMenuBar) DECLARE_DYNAMIC_CLASS(wxMenuBar)
}; };

2
src/gtk/frame.cpp
View File

@@ -302,7 +302,7 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
{ {
#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 #if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
hildon_window_set_menu(HILDON_WINDOW(m_widget), 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 #else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
m_frameMenuBar->SetParent(this); m_frameMenuBar->SetParent(this);