X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e14e49f384b19c88a98796a6bc3a911d9cffdf3..f76dbc4d52c005b63745cf924efe30eece4c6f79:/src/gtk/frame.cpp

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 2fc6814ccd..9b7aa4a001 100644
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -45,6 +45,7 @@ const int wxPLACE_HOLDER   = 0;
 
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
+extern int g_openDialogs;
 
 //-----------------------------------------------------------------------------
 // data
@@ -85,7 +86,7 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
                                 (int)alloc->width,
                                 (int)alloc->height );
 */
-				
+
         win->m_width = alloc->width;
         win->m_height = alloc->height;
         win->UpdateSize();
@@ -101,7 +102,8 @@ static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WX
     if (g_isIdle)
         wxapp_install_idle_handler();
 
-    win->Close();
+    if (g_openDialogs == 0)
+        win->Close();
 
     return TRUE;
 }
@@ -164,19 +166,20 @@ static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidge
 // "configure_event"
 //-----------------------------------------------------------------------------
 
-static gint 
-#if (GTK_MINOR_VERSON > 0)
+static gint
+#if (GTK_MINOR_VERSION > 0)
 gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxFrame *win )
 #else
 gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
 #endif
 {
-    if (g_isIdle) 
+    if (g_isIdle)
         wxapp_install_idle_handler();
 
-    if (!win->m_hasVMT) return FALSE;
-
-#if (GTK_MINOR_VERSON > 0)
+    if (!win->m_hasVMT) 
+        return FALSE;
+	
+#if (GTK_MINOR_VERSION > 0)
     int x = 0;
     int y = 0;
     gdk_window_get_root_origin( win->m_widget->window, &x, &y );
@@ -207,14 +210,10 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
     if (g_isIdle)
         wxapp_install_idle_handler();
 
-    // FIXME I don't know when does it appear, but it's not in 1.2.2
-#if GTK_CHECK_VERSION(1, 2, 3)
     /* I haven't been able to set the position of
        the dialog before it is shown, so I set the
        position in "realize" */
-    wxLogDebug( "%d %d\n", win->m_x, win->m_y );
-    gtk_window_reposition( GTK_WINDOW(widget), win->m_x, win->m_y );
-#endif // GTK > 1.2.2
+    gtk_widget_set_uposition( widget, win->m_x, win->m_y );
 
     /* all this is for Motif Window Manager "hints" and is supposed to be
        recognized by other WM as well. not tested. */
@@ -254,18 +253,18 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
         gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
 
     /* set size hints */
-    gint flag =	GDK_HINT_POS;
+    gint flag = 0; // GDK_HINT_POS;
     if ((win->GetMinWidth() != -1) || (win->GetMinHeight() != -1)) flag |= GDK_HINT_MIN_SIZE;
     if ((win->GetMaxWidth() != -1) || (win->GetMaxHeight() != -1)) flag |= GDK_HINT_MAX_SIZE;
     if (flag)
     {
-        gdk_window_set_hints( win->m_widget->window, 
-	                      win->m_x, win->m_y,
-			      win->GetMinWidth(), win->GetMinHeight(),
-			      win->GetMaxWidth(), win->GetMaxHeight(),
-			      flag );
+        gdk_window_set_hints( win->m_widget->window,
+                              win->m_x, win->m_y,
+                              win->GetMinWidth(), win->GetMinHeight(),
+                              win->GetMaxWidth(), win->GetMaxHeight(),
+                              flag );
     }
-    
+
     /* reset the icon */
     if (win->m_icon != wxNullIcon)
     {
@@ -304,7 +303,7 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
 static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
 {
     wxASSERT( GTK_IS_WIDGET(child->m_widget) );
-    
+
     if (!parent->m_insertInClientArea)
     {
         /* these are outside the client area */
@@ -401,14 +400,14 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxFrame creation failed") );
-	return FALSE;
+        return FALSE;
     }
 
     m_title = title;
 
     m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame;
 
-    GtkWindowType win_type = GTK_WINDOW_DIALOG;  // this makes window placement work
+    GtkWindowType win_type = GTK_WINDOW_TOPLEVEL;
     if (style & wxSIMPLE_BORDER) win_type = GTK_WINDOW_POPUP;
 
     m_widget = gtk_window_new( win_type );
@@ -534,6 +533,7 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 
     int old_x = m_x;
     int old_y = m_y;
+
     int old_width = m_width;
     int old_height = m_height;
 
@@ -569,16 +569,13 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
     if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
     if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
 
-    // FIXME I don't know when does it appear, but it's not in 1.2.2
-#if GTK_CHECK_VERSION(1, 2, 3)
     if ((m_x != -1) || (m_y != -1))
     {
         if ((m_x != old_x) || (m_y != old_y))
         {
-            gtk_window_reposition( GTK_WINDOW(m_widget), m_x, m_y );
+            gtk_widget_set_uposition( m_widget, m_x, m_y );
         }
     }
-#endif // GTK > 1.2.2
 
     if ((m_width != old_width) || (m_height != old_height))
     {
@@ -653,8 +650,6 @@ void wxFrame::DoSetClientSize( int width, int height )
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
-    printf( "set size %d %d\n", width, height );
-
         /* menu bar */
         if (m_frameMenuBar)
         {
@@ -702,7 +697,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
 
     m_width = width;
     m_height = height;
-    
+
     /* space occupied by m_frameToolBar and m_frameMenuBar */
     int client_area_y_offset = 0;
 
@@ -746,7 +741,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
 
 #if wxUSE_TOOLBAR
         if ((m_frameToolBar) &&
-	    (m_frameToolBar->m_widget->parent == m_mainWidget))
+            (m_frameToolBar->m_widget->parent == m_mainWidget))
         {
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;
@@ -759,7 +754,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
             }
             int ww = m_width - 2*m_miniEdge;
             int hh = m_frameToolBar->m_height;
-	    if (m_toolBarDetached) hh = wxPLACE_HOLDER;
+            if (m_toolBarDetached) hh = wxPLACE_HOLDER;
             m_frameToolBar->m_x = xx;
             m_frameToolBar->m_y = yy;
             /* m_frameToolBar->m_height = hh;   don't change the toolbar's reported size
@@ -807,7 +802,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
 
 
     m_sizeSet = TRUE;
-    
+
     // send size event to frame
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
@@ -837,11 +832,11 @@ void wxFrame::OnInternalIdle()
     if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))
     {
         GtkOnSize( m_x, m_y, m_width, m_height );
-	
-	// we'll come back later
+
+        // we'll come back later
         if (g_isIdle)
             wxapp_install_idle_handler();
-	return;
+        return;
     }
 
     if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle();
@@ -929,8 +924,8 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
                 gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached",
                     GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
             }
-	    
-	    m_frameMenuBar->Show( TRUE );
+
+            m_frameMenuBar->Show( TRUE );
         }
     }
 
@@ -995,9 +990,9 @@ wxToolBar* wxFrame::OnCreateToolBar( long style, wxWindowID id, const wxString&
     return new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name );
 }
 
-void wxFrame::SetToolBar(wxToolBar *toolbar) 
-{ 
-    m_frameToolBar = toolbar; 
+void wxFrame::SetToolBar(wxToolBar *toolbar)
+{
+    m_frameToolBar = toolbar;
     if (m_frameToolBar)
     {
         /* insert into toolbar area if not already there */
@@ -1005,10 +1000,10 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
             (m_frameToolBar->m_widget->parent != m_mainWidget))
         {
             GetChildren().DeleteObject( m_frameToolBar );
-	
-	    gtk_widget_reparent( m_frameToolBar->m_widget, m_mainWidget );
-	    UpdateSize();
-	}
+
+            gtk_widget_reparent( m_frameToolBar->m_widget, m_mainWidget );
+            UpdateSize();
+        }
     }
 }
 
@@ -1122,25 +1117,25 @@ void wxFrame::SetIcon( const wxIcon &icon )
     gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
 }
 
-void wxFrame::Maximize(bool WXUNUSED(maximize)) 
+void wxFrame::Maximize(bool WXUNUSED(maximize))
 {
 }
 
-void wxFrame::Restore() 
+void wxFrame::Restore()
 {
 }
 
-void wxFrame::Iconize( bool iconize ) 
-{ 
+void wxFrame::Iconize( bool iconize )
+{
    if (iconize)
    {
         XIconifyWindow( GDK_WINDOW_XDISPLAY( m_widget->window ),
-	                GDK_WINDOW_XWINDOW( m_widget->window ),
-			DefaultScreen( GDK_DISPLAY() ) );
+                        GDK_WINDOW_XWINDOW( m_widget->window ),
+                        DefaultScreen( GDK_DISPLAY() ) );
    }
 }
 
-bool wxFrame::IsIconized() const 
-{ 
-    return FALSE; 
+bool wxFrame::IsIconized() const
+{
+    return FALSE;
 }