X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d66b09982c9cadc20f9abcf9e2bdc804ffa877a..c782096417f0fd9de6c6d47b23174233ec6bcf57:/src/gtk/frame.cpp diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 0690e2602b..68adf5fb90 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -318,7 +318,10 @@ void wxFrame::GtkOnSize() // m_mainWidget holds the menubar, the toolbar and the client // area, which is represented by m_wxwindow. +#if wxUSE_MENUS_NATIVE int menubarHeight = 0; +#endif + #if wxUSE_MENUS_NATIVE if (HasVisibleMenubar()) { @@ -345,7 +348,11 @@ void wxFrame::GtkOnSize() (m_frameToolBar->m_widget->parent == m_mainWidget)) { int xx = m_miniEdge; - int yy = m_miniEdge + m_miniTitle + menubarHeight; + int yy = m_miniEdge + m_miniTitle +#if wxUSE_MENUS_NATIVE + + menubarHeight +#endif + ; m_frameToolBar->m_x = xx; m_frameToolBar->m_y = yy; @@ -377,7 +384,7 @@ void wxFrame::GtkOnSize() yy = GetClientSize().y; #if wxUSE_MENUS_NATIVE yy += m_menuBarHeight; -#endif // wxUSE_MENU_NATIVE +#endif // wxUSE_MENUS_NATIVE m_frameToolBar->m_x = xx; m_frameToolBar->m_y = yy; ww = m_width - 2*m_miniEdge;