Fix type mismatch in wxLogTrace() call in wxSocket.

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

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 425aac9ae91cc37c1823a10c9bc5d93e33035a2b..7fcfd47c56e7eb9304bb486c0e4903542753ff48 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -13,36 +13,29 @@
 #include "wx/dialog.h"
 
 #ifndef WX_PRECOMP
 #include "wx/dialog.h"
 
 #ifndef WX_PRECOMP

-    #include "wx/app.h"
-    #include "wx/frame.h"

     #include "wx/cursor.h"
 #endif // WX_PRECOMP
 
 #include "wx/evtloop.h"
 
     #include "wx/cursor.h"
 #endif // WX_PRECOMP
 
 #include "wx/evtloop.h"
 

-#include <gdk/gdk.h>
+#include "wx/scopedptr.h"
+

 #include <gtk/gtk.h>
 #include <gtk/gtk.h>

-#include <gdk/gdkkeysyms.h>

 
 

-#include "wx/gtk/win_gtk.h"
+// this is defined in src/gtk/toplevel.cpp
+extern int wxOpenModalDialogsCount;

 
 

-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop)

 
 

-// Don't allow window closing if there are open dialogs
-int g_openDialogs;

 
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
-

 void wxDialog::Init()
 {
 void wxDialog::Init()
 {

+    m_modalLoop = NULL;

     m_returnCode = 0;
     m_returnCode = 0;

-    m_sizeSet = false;

     m_modalShowing = false;
     m_themeEnabled = true;
 }
     m_modalShowing = false;
     m_themeEnabled = true;
 }


@@ -77,23 +70,24 @@ bool wxDialog::Show( bool show )
         EndModal( wxID_CANCEL );
     }
 
         EndModal( wxID_CANCEL );
     }
 

-    if (show && !m_sizeSet)
-    {
-        /* by calling GtkOnSize here, we don't have to call
-           either after showing the frame, which would entail
-           much ugly flicker nor from within the size_allocate
-           handler, because GTK 1.1.X forbids that. */
-
-        GtkOnSize();
-    }
+    if (show && CanDoLayoutAdaptation())
+        DoLayoutAdaptation();

 
 

-    bool ret = wxWindow::Show( show );
+    bool ret = wxDialogBase::Show(show);

 
 

-    if (show) InitDialog();
+    if (show)
+        InitDialog();

 
     return ret;
 }
 
 
     return ret;
 }
 

+wxDialog::~wxDialog()
+{
+    // if the dialog is modal, this will end its event loop
+    if ( IsModal() )
+        EndModal(wxID_CANCEL);
+}
+

 bool wxDialog::IsModal() const
 {
     return m_modalShowing;
 bool wxDialog::IsModal() const
 {
     return m_modalShowing;


@@ -106,22 +100,20 @@ void wxDialog::SetModal( bool WXUNUSED(flag) )
 
 int wxDialog::ShowModal()
 {
 
 int wxDialog::ShowModal()
 {

-    if (IsModal())
-    {
-       wxFAIL_MSG( wxT("wxDialog:ShowModal called twice") );
-       return GetReturnCode();
-    }
+    wxASSERT_MSG( !IsModal(), "ShowModal() can't be called twice" );

 
 

-    // use the apps top level window as parent if none given unless explicitly
-    // forbidden
-    if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
+    // 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();
+
+    wxWindow * const parent = GetParentForModalDialog();
+    if ( parent )

     {
     {

-        wxWindow * const parent = GetParentForModalDialog();
-        if ( parent && parent != this )
-        {
-            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) );

     }
 
     wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
     }
 
     wxBusyCursorSuspender cs; // temporarily suppress the busy cursor


@@ -130,16 +122,20 @@ int wxDialog::ShowModal()
 
     m_modalShowing = true;
 
 
     m_modalShowing = true;
 

-    g_openDialogs++;
+    wxOpenModalDialogsCount++;

 
     // NOTE: gtk_window_set_modal internally calls gtk_grab_add() !
     gtk_window_set_modal(GTK_WINDOW(m_widget), TRUE);
 
 
     // NOTE: gtk_window_set_modal internally calls gtk_grab_add() !
     gtk_window_set_modal(GTK_WINDOW(m_widget), TRUE);
 

-    wxEventLoop().Run();
+    // Run modal dialog event loop.
+    {
+        wxGUIEventLoopTiedPtr modal(&m_modalLoop, new wxGUIEventLoop());
+        m_modalLoop->Run();
+    }

 
     gtk_window_set_modal(GTK_WINDOW(m_widget), FALSE);
 
 
     gtk_window_set_modal(GTK_WINDOW(m_widget), FALSE);
 

-    g_openDialogs--;
+    wxOpenModalDialogsCount--;

 
     return GetReturnCode();
 }
 
     return GetReturnCode();
 }


@@ -150,13 +146,16 @@ void wxDialog::EndModal( int retCode )
 
     if (!IsModal())
     {
 
     if (!IsModal())
     {

-        wxFAIL_MSG( wxT("wxDialog:EndModal called twice") );
+        wxFAIL_MSG( "either wxDialog:EndModal called twice or ShowModal wasn't called" );

         return;
     }
 
     m_modalShowing = false;
 
         return;
     }
 
     m_modalShowing = false;
 

-    gtk_main_quit();
+    // Ensure Exit() is only called once. The dialog's event loop may be terminated
+    // externally due to an uncaught exception.
+    if (m_modalLoop && m_modalLoop->IsRunning())
+        m_modalLoop->Exit();

 
     Show( false );
 }
 
     Show( false );
 }