Translate the wxALIGN flags to the Cocoa alignment type in wxStaticText::Create

[wxWidgets.git] / src / gtk / frame.cpp

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 0690e2602bb49b2149cb186a687d1689d5ad7f2f..68adf5fb90d0c13f984662ad7aa64b932f84ac0e 100644 (file)
--- 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.
 
         // m_mainWidget holds the menubar, the toolbar and the client
         // area, which is represented by m_wxwindow.
 

+#if wxUSE_MENUS_NATIVE

         int menubarHeight = 0;
         int menubarHeight = 0;

+#endif
+

 #if wxUSE_MENUS_NATIVE
         if (HasVisibleMenubar())
         {
 #if wxUSE_MENUS_NATIVE
         if (HasVisibleMenubar())
         {


@@ -345,7 +348,11 @@ void wxFrame::GtkOnSize()
             (m_frameToolBar->m_widget->parent == m_mainWidget))
         {
             int xx = m_miniEdge;
             (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;
 
             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;
                 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;
                 m_frameToolBar->m_x = xx;
                 m_frameToolBar->m_y = yy;
                 ww = m_width - 2*m_miniEdge;