]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/frame.cpp
pixbuf cursor support is for GTK 2.4.
[wxWidgets.git] / src / gtk / frame.cpp
index 5c01cae6db376cbeb6266d73a2ebde5ccccc7947..29c492c62d43d9da0789d9c7566daab29c48472f 100644 (file)
@@ -221,7 +221,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
     {
 #if wxUSE_MENUS_NATIVE
         // menu bar
     {
 #if wxUSE_MENUS_NATIVE
         // menu bar
-        if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR != 0)))
+        if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR) != 0))
         {
             if (!m_menuBarDetached)
                 (*height) -= m_menuBarHeight;
         {
             if (!m_menuBarDetached)
                 (*height) -= m_menuBarHeight;
@@ -233,7 +233,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
 #if wxUSE_STATUSBAR
         // status bar
         if (m_frameStatusBar && m_frameStatusBar->IsShown() && 
 #if wxUSE_STATUSBAR
         // status bar
         if (m_frameStatusBar && m_frameStatusBar->IsShown() && 
-            !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR != 0)))
+            !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR) != 0))
             (*height) -= wxSTATUS_HEIGHT;
 #endif // wxUSE_STATUSBAR
     }
             (*height) -= wxSTATUS_HEIGHT;
 #endif // wxUSE_STATUSBAR
     }
@@ -277,7 +277,7 @@ void wxFrame::DoSetClientSize( int width, int height )
 
 #if wxUSE_MENUS_NATIVE
         // menu bar
 
 #if wxUSE_MENUS_NATIVE
         // menu bar
-        if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR != 0)))
+        if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR) != 0))
         {
             if (!m_menuBarDetached)
                 height += m_menuBarHeight;
         {
             if (!m_menuBarDetached)
                 height += m_menuBarHeight;
@@ -289,7 +289,7 @@ void wxFrame::DoSetClientSize( int width, int height )
 #if wxUSE_STATUSBAR
         // status bar
         if (m_frameStatusBar && m_frameStatusBar->IsShown() && 
 #if wxUSE_STATUSBAR
         // status bar
         if (m_frameStatusBar && m_frameStatusBar->IsShown() && 
-            !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR != 0)))
+            !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR) != 0))
             height += wxSTATUS_HEIGHT;
 #endif
 
             height += wxSTATUS_HEIGHT;
 #endif
 
@@ -352,19 +352,6 @@ void wxFrame::GtkOnSize()
 
     if (m_mainWidget)
     {
 
     if (m_mainWidget)
     {
-        // set size hints
-        gint flag = 0; // GDK_HINT_POS;
-        if ((minWidth != -1) || (minHeight != -1)) flag |= GDK_HINT_MIN_SIZE;
-        if ((maxWidth != -1) || (maxHeight != -1)) flag |= GDK_HINT_MAX_SIZE;
-        GdkGeometry geom;
-        geom.min_width = minWidth;
-        geom.min_height = minHeight;
-        geom.max_width = maxWidth;
-        geom.max_height = maxHeight;
-        gtk_window_set_geometry_hints( GTK_WINDOW(m_widget),
-                                       (GtkWidget*) NULL,
-                                       &geom,
-                                       (GdkWindowHints) flag );
         // TODO
         // Rewrite this terrible code to using GtkVBox
 
         // TODO
         // Rewrite this terrible code to using GtkVBox
 
@@ -372,7 +359,7 @@ void wxFrame::GtkOnSize()
         // area, which is represented by m_wxwindow.
 
 #if wxUSE_MENUS_NATIVE
         // area, which is represented by m_wxwindow.
 
 #if wxUSE_MENUS_NATIVE
-        if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR != 0)))
+        if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR) != 0))
         {
             if (!GTK_WIDGET_VISIBLE(m_frameMenuBar->m_widget))
                 gtk_widget_show( m_frameMenuBar->m_widget );
         {
             if (!GTK_WIDGET_VISIBLE(m_frameMenuBar->m_widget))
                 gtk_widget_show( m_frameMenuBar->m_widget );
@@ -494,7 +481,7 @@ void wxFrame::GtkOnSize()
 
 #if wxUSE_STATUSBAR
     if (m_frameStatusBar && m_frameStatusBar->IsShown() &&
 
 #if wxUSE_STATUSBAR
     if (m_frameStatusBar && m_frameStatusBar->IsShown() &&
-        !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR != 0)))
+        !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR) != 0))
     {
         if (!GTK_WIDGET_VISIBLE(m_frameStatusBar->m_widget))
             gtk_widget_show( m_frameStatusBar->m_widget );
     {
         if (!GTK_WIDGET_VISIBLE(m_frameStatusBar->m_widget))
             gtk_widget_show( m_frameStatusBar->m_widget );
@@ -644,20 +631,22 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
 
 void wxFrame::UpdateMenuBarSize()
 {
 
 void wxFrame::UpdateMenuBarSize()
 {
-    GtkRequisition  req;
-
-    req.width = 2;
-    req.height = 2;
+    m_menuBarHeight = 2;
 
     // this is called after Remove with a NULL m_frameMenuBar
     if ( m_frameMenuBar )
 
     // this is called after Remove with a NULL m_frameMenuBar
     if ( m_frameMenuBar )
-        (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_frameMenuBar->m_widget) )->size_request )
-            (m_frameMenuBar->m_widget, &req );
-
-    m_menuBarHeight = req.height;
+    {
+        GtkRequisition req;
+        gtk_widget_ensure_style(m_frameMenuBar->m_widget);
+        // have to call class method directly because
+        // "size_request" signal is overridden by wx
+        GTK_WIDGET_GET_CLASS(m_frameMenuBar->m_widget)->size_request(
+            m_frameMenuBar->m_widget, &req);
+
+        m_menuBarHeight = req.height;
+    }
 
     // resize window in OnInternalIdle
 
     // resize window in OnInternalIdle
-
     GtkUpdateSize();
 }
 
     GtkUpdateSize();
 }