Rearrange code to fix some problems

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

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 31df13df6b5bc7fc9c2643ec7aee08a2b423eb25..056a469fea74c21b83ddde63d15c10067115707a 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dialog.cpp
+// Name:        src/gtk/dialog.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -11,9 +11,13 @@
 #include "wx/wxprec.h"
 
 #include "wx/dialog.h"
-#include "wx/frame.h"
-#include "wx/app.h"
-#include "wx/cursor.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/frame.h"
+    #include "wx/cursor.h"
+#endif // WX_PRECOMP
+
 #include "wx/evtloop.h"
 
 #include <gdk/gdk.h>
@@ -26,19 +30,13 @@
 // global data
 //-----------------------------------------------------------------------------
 
-extern int g_openDialogs;
+// Don't allow window closing if there are open dialogs
+int g_openDialogs;
 
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxDialog,wxDialogBase)
-    EVT_BUTTON  (wxID_OK,       wxDialog::OnOK)
-    EVT_BUTTON  (wxID_CANCEL,   wxDialog::OnCancel)
-    EVT_BUTTON  (wxID_APPLY,    wxDialog::OnApply)
-    EVT_CLOSE   (wxDialog::OnCloseWindow)
-END_EVENT_TABLE()
-
 IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
 
 void wxDialog::Init()
@@ -72,75 +70,6 @@ bool wxDialog::Create( wxWindow *parent,
     return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name);
 }
 
-void wxDialog::OnApply( wxCommandEvent &WXUNUSED(event) )
-{
-    if (Validate())
-        TransferDataFromWindow();
-}
-
-void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
-{
-    if (IsModal())
-    {
-        EndModal(wxID_CANCEL);
-    }
-    else
-    {
-        SetReturnCode(wxID_CANCEL);
-        Show(false);
-    }
-}
-
-void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
-{
-    if (Validate() && TransferDataFromWindow())
-    {
-        if (IsModal())
-        {
-            EndModal(wxID_OK);
-        }
-        else
-        {
-            SetReturnCode(wxID_OK);
-            Show(false);
-        }
-    }
-}
-
-void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) )
-{
-    // yes
-}
-
-void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
-    // We'll send a Cancel message by default,
-    // which may close the dialog.
-    // Check for looping if the Cancel event handler calls Close().
-
-    // Note that if a cancel button and handler aren't present in the dialog,
-    // nothing will happen when you close the dialog via the window manager, or
-    // via Close().
-    // We wouldn't want to destroy the dialog by default, since the dialog may have been
-    // created on the stack.
-    // However, this does mean that calling dialog->Close() won't delete the dialog
-    // unless the handler for wxID_CANCEL does so. So use Destroy() if you want to be
-    // sure to destroy the dialog.
-    // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
-
-    static wxList s_closing;
-
-    if (s_closing.Member(this))
-        return;   // no loops
-
-    s_closing.Append(this);
-
-    wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-    cancelEvent.SetEventObject( this );
-    GetEventHandler()->ProcessEvent(cancelEvent);
-    s_closing.DeleteObject(this);
-}
-
 bool wxDialog::Show( bool show )
 {
     if (!show && IsModal())
@@ -155,7 +84,7 @@ bool wxDialog::Show( bool show )
            much ugly flicker nor from within the size_allocate
            handler, because GTK 1.1.X forbids that. */
 
-        GtkOnSize( m_x, m_y, m_width, m_height );
+        GtkOnSize();
     }
 
     bool ret = wxWindow::Show( show );
@@ -183,18 +112,22 @@ int wxDialog::ShowModal()
        return GetReturnCode();
     }
 
+    // release the mouse if it's currently captured as the window having it
+    // will be disabled when this dialog is shown -- but will still keep the
+    // capture making it impossible to do anything in the modal dialog itself
+    wxWindow * const win = wxWindow::GetCapture();
+    if ( win )
+        win->GTKReleaseMouseAndNotify();
+
     // use the apps top level window as parent if none given unless explicitly
     // forbidden
     if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
     {
-        wxWindow *parent = wxTheApp->GetTopWindow();
-        if ( parent &&
-                parent != this &&
-                    parent->IsBeingDeleted() &&
-                        !(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) )
+        wxWindow * const parent = GetParentForModalDialog();
+        if ( parent && parent != this )
         {
-            m_parent = parent;
-            gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(parent->m_widget) );
+            gtk_window_set_transient_for( GTK_WINDOW(m_widget),
+                                          GTK_WINDOW(parent->m_widget) );
         }
     }
 
@@ -206,11 +139,12 @@ int wxDialog::ShowModal()
 
     g_openDialogs++;
 
-    gtk_grab_add( m_widget );
+    // NOTE: gtk_window_set_modal internally calls gtk_grab_add() !
+    gtk_window_set_modal(GTK_WINDOW(m_widget), TRUE);
 
-    wxEventLoop().Run();
+    wxGUIEventLoop().Run();
 
-    gtk_grab_remove( m_widget );
+    gtk_window_set_modal(GTK_WINDOW(m_widget), FALSE);
 
     g_openDialogs--;