X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69cdfbf7f89bd17af47c5c77c7bc94fe59937db9..ba2a0103aa071e0db2f2740f4bd5c9154a94cfa3:/src/gtk/frame.cpp

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 0e181020ff..5bc43e0bb8 100644
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -191,26 +191,33 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
 
     /* all this is for Motif Window Manager "hints" and is supposed to be
        recognized by other WM as well. not tested. */
-    long decor = (long) GDK_DECOR_ALL;
-    long func = (long) GDK_FUNC_ALL;
+    long decor = (long) GDK_DECOR_BORDER;
+    long func = (long) GDK_FUNC_MOVE;
     
-    if ((win->m_windowStyle & wxCAPTION) == 0)
+    if ((win->m_windowStyle & wxCAPTION) != 0)
 	decor |= GDK_DECOR_TITLE;
-    if ((win->m_windowStyle & wxSYSTEM_MENU) == 0)
-	decor |= GDK_DECOR_MENU;
-    if ((win->m_windowStyle & wxMINIMIZE_BOX) == 0)
+    if ((win->m_windowStyle & wxSYSTEM_MENU) != 0)
+    {
+       decor |= GDK_DECOR_MENU;
+       func |= GDK_FUNC_CLOSE;
+    }
+    if ((win->m_windowStyle & wxMINIMIZE_BOX) != 0)
     {
 	func |= GDK_FUNC_MINIMIZE;
 	decor |= GDK_DECOR_MINIMIZE;
     }
-    if ((win->m_windowStyle & wxMAXIMIZE_BOX) == 0)
+    if ((win->m_windowStyle & wxMAXIMIZE_BOX) != 0)
     {
 	func |= GDK_FUNC_MAXIMIZE;
 	decor |= GDK_DECOR_MAXIMIZE;
     }
-    if ((win->m_windowStyle & wxRESIZE_BORDER) == 0)
-	func |= GDK_FUNC_RESIZE;
-	
+    if ((win->m_windowStyle & wxRESIZE_BORDER) != 0)
+    {
+       func |= GDK_FUNC_RESIZE;
+       decor |= GDK_DECOR_RESIZEH;
+    }
+
+    
     gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)decor);
     gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func);
       
@@ -267,7 +274,9 @@ static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child )
         gtk_myfixed_put( GTK_MYFIXED(frame->m_mainWidget),
                          GTK_WIDGET(child->m_widget),
                          child->m_x,
-                         child->m_y );
+                         child->m_y,
+			 child->m_width,
+			 child->m_height );
 			 
 	/* we connect to these events for recalculating the client area
 	   space when the toolbar is floating */
@@ -290,13 +299,11 @@ static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child )
         gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow),
                          GTK_WIDGET(child->m_widget),
                          child->m_x,
-                         child->m_y );
+                         child->m_y,
+			 child->m_width,
+			 child->m_height );
     }
 
-    gtk_widget_set_usize( GTK_WIDGET(child->m_widget),
-                          child->m_width,
-                          child->m_height );
-
     /* resize on OnInternalIdle */
     parent->m_sizeSet = FALSE;
 }
@@ -665,13 +672,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
             m_frameMenuBar->m_y = yy;
             m_frameMenuBar->m_width = ww;
             m_frameMenuBar->m_height = hh;
-
-            gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_frameMenuBar->m_widget, xx, yy );
-	    
-//	    m_frameMenuBar->m_widget->requisition.width = ww;
-//	    m_frameMenuBar->m_widget->requisition.height = hh;
-            gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, hh );
-	
+            gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), 
+	                          m_frameMenuBar->m_widget, 
+				  xx, yy, ww, hh );
 	    client_area_y_offset += hh;
         }
     
@@ -693,21 +696,19 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
             m_frameToolBar->m_y = yy;
             /* m_frameToolBar->m_height = hh;   don't change the toolbar's height */
             m_frameToolBar->m_width = ww;
-
-            gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_frameToolBar->m_widget, xx, yy );
-	    
-            gtk_widget_set_usize( m_frameToolBar->m_widget, ww, hh );
-	
+            gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), 
+	                          m_frameToolBar->m_widget, 
+			          xx, yy, ww, hh );
 	    client_area_y_offset += hh;
         }
     
         int client_x = m_miniEdge;
 	int client_y = client_area_y_offset + m_miniEdge + m_miniTitle;
-        gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_wxwindow, client_x, client_y );
-
         int client_w = m_width - 2*m_miniEdge;
 	int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle;
-        gtk_widget_set_usize( m_wxwindow, client_w, client_h );
+        gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), 
+	                      m_wxwindow, 
+			      client_x, client_y, client_w, client_h );
     }
     else
     {
@@ -721,17 +722,13 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
         int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset;
         int ww = m_width - 2*m_miniEdge;
         int hh = wxSTATUS_HEIGHT;
-
         m_frameStatusBar->m_x = xx;
         m_frameStatusBar->m_y = yy;
         m_frameStatusBar->m_width = ww;
         m_frameStatusBar->m_height = hh;
-
-        gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameStatusBar->m_widget, xx, yy );
-	
-//	m_frameStatusBar->m_widget->requisition.width = ww;
-//	m_frameStatusBar->m_widget->requisition.height = hh;
-        gtk_widget_set_usize( m_frameStatusBar->m_widget, ww, hh );
+        gtk_myfixed_set_size( GTK_MYFIXED(m_wxwindow), 
+	                      m_frameStatusBar->m_widget, 
+			      xx, yy, ww, hh );
     }
 
     /* we actually set the size of a frame here and no-where else */
@@ -851,7 +848,11 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
         {
             m_frameMenuBar->m_parent = this;
             gtk_myfixed_put( GTK_MYFIXED(m_mainWidget),
-                m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
+                m_frameMenuBar->m_widget, 
+		m_frameMenuBar->m_x, 
+		m_frameMenuBar->m_y,
+		m_frameMenuBar->m_width,
+		m_frameMenuBar->m_height );
 	
 	    if (menuBar->m_windowStyle & wxMB_DOCKABLE)
 	    {