X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fab591c5cceff41c0bedaa89af34cd039e2c44e1..8161b5b9f03998a332dbacad3b476a292bc847f6:/src/gtk1/toplevel.cpp

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index 7b4d04a2db..1ca2768d11 100644
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -362,8 +362,9 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
 
     m_widget = gtk_window_new( win_type );
 
-    if (m_parent && (GTK_IS_WINDOW(m_parent->m_widget)) &&
-        (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG))
+    if (m_parent && (((GTK_IS_WINDOW(m_parent->m_widget)) &&
+		      (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)) ||
+		     (style & wxFRAME_FLOAT_ON_PARENT)))
     {
         gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
     }
@@ -480,10 +481,10 @@ wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
 {
     if (m_grabbed)
     {
-        wxASSERT_MSG( FALSE, "Window still grabbed");
+        wxASSERT_MSG( FALSE, _T("Window still grabbed"));
         RemoveGrab();
     }
-    
+
     m_isBeingDeleted = TRUE;
 
     // it may also be GtkScrolledWindow in the case of an MDI child
@@ -491,17 +492,6 @@ wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
     {
         gtk_window_set_focus( GTK_WINDOW(m_widget), NULL );
     }
-
-    wxTopLevelWindows.DeleteObject( this );
-
-    if (wxTheApp->GetTopWindow() == this)
-        wxTheApp->SetTopWindow( (wxWindow*) NULL );
-
-    if ((wxTopLevelWindows.Number() == 0) &&
-        (wxTheApp->GetExitOnFrameDelete()))
-    {
-        wxTheApp->ExitMainLoop();
-    }
 }
 
 
@@ -522,11 +512,11 @@ static void wx_win_hints_set_layer(GtkWidget *window, int layer)
     XEvent xev;
     GdkWindowPrivate *priv;
     gint prev_error;
-  
+
     prev_error = gdk_error_warnings;
     gdk_error_warnings = 0;
     priv = (GdkWindowPrivate*)(GTK_WIDGET(window)->window);
-  
+
     if (GTK_WIDGET_MAPPED(window))
     {
         xev.type = ClientMessage;
@@ -536,14 +526,14 @@ static void wx_win_hints_set_layer(GtkWidget *window, int layer)
         xev.xclient.format = 32;
         xev.xclient.data.l[0] = (long)layer;
         xev.xclient.data.l[1] = gdk_time_get();
-      
+
         XSendEvent(GDK_DISPLAY(), GDK_ROOT_WINDOW(), False,
             SubstructureNotifyMask, (XEvent*) &xev);
     }
     else
     {
         long data[1];
-      
+
         data[0] = layer;
         XChangeProperty(GDK_DISPLAY(), priv->xwindow, gs_XA_WIN_LAYER,
               XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 1);
@@ -574,14 +564,14 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
 
         int screen_width,screen_height;
         wxDisplaySize( &screen_width, &screen_height );
-        
+
 		gint client_x, client_y, root_x, root_y;
 		gint width, height;
 
 		gdk_window_get_origin (m_widget->window, &root_x, &root_y);
 		gdk_window_get_geometry (m_widget->window, &client_x, &client_y,
 					 &width, &height, NULL);
-                     
+
         wx_win_hints_set_layer( m_widget, WIN_LAYER_ABOVE_DOCK );
 
 		gdk_window_move_resize (m_widget->window, -client_x, -client_y,
@@ -590,7 +580,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
     else
     {
         wx_win_hints_set_layer( m_widget, WIN_LAYER_NORMAL );
-        
+
         SetSize( m_fsSaveFrame.x, m_fsSaveFrame.y, m_fsSaveFrame.width, m_fsSaveFrame.height );
     }
 
@@ -778,7 +768,7 @@ void wxTopLevelWindowGTK::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
             // Gtk-WARNING **: gtk_widget_size_allocate():
             //       attempt to allocate widget with width 65535 and height 600
             // but I don't have time to track them all now..
-            // 
+            //
             // Really we need to encapulate all this height/width business and
             // stop any old method from ripping at the members directly and
             // scattering -1's without regard for who might resolve them later.
@@ -904,9 +894,16 @@ void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &icons )
 // frame state: maximized/iconized/normal
 // ----------------------------------------------------------------------------
 
-void wxTopLevelWindowGTK::Maximize(bool WXUNUSED(maximize))
+void wxTopLevelWindowGTK::Maximize(bool maximize)
 {
+#ifdef __WXGTK20__
+    if (maximize)
+        gtk_window_maximize( GTK_WINDOW( m_widget ) );
+    else
+        gtk_window_unmaximize( GTK_WINDOW( m_widget ) );
+#else
     wxFAIL_MSG( _T("not implemented") );
+#endif
 }
 
 bool wxTopLevelWindowGTK::IsMaximized() const
@@ -919,11 +916,22 @@ bool wxTopLevelWindowGTK::IsMaximized() const
 
 void wxTopLevelWindowGTK::Restore()
 {
+#ifdef __GTK20__
+    // "Present" seems similar enough to "restore"
+    gtk_window_present( GTK_WINDOW( m_widget ) );
+#else
     wxFAIL_MSG( _T("not implemented") );
+#endif
 }
 
 void wxTopLevelWindowGTK::Iconize( bool iconize )
 {
+#ifdef __WXGTK20__
+    if (iconize)
+        gtk_window_iconify( GTK_WINDOW( m_widget ) );
+    else
+        gtk_window_deiconify( GTK_WINDOW( m_widget ) );
+#else
    if (iconize)
    {
        GdkWindow *window = m_widget->window;
@@ -935,6 +943,7 @@ void wxTopLevelWindowGTK::Iconize( bool iconize )
                        GDK_WINDOW_XWINDOW( window ),
                        DefaultScreen( GDK_DISPLAY() ) );
    }
+#endif
 }
 
 bool wxTopLevelWindowGTK::IsIconized() const