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
This commit is contained in:
@@ -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)
|
||||
};
|
||||
|
||||
|
@@ -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);
|
||||
|
||||
|
Reference in New Issue
Block a user