add missing ! accidentally dropped in last commit

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

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 425aac9ae91cc37c1823a10c9bc5d93e33035a2b..bb0f74e2efcee2dc2bc8e7c500681757380915d7 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -13,25 +13,15 @@
 #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 <gtk/gtk.h>
 #include <gtk/gtk.h>

-#include <gdk/gdkkeysyms.h>

 
 

-#include "wx/gtk/win_gtk.h"
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-// Don't allow window closing if there are open dialogs
-int g_openDialogs;
+// this is defined in src/gtk/toplevel.cpp
+extern int wxOpenModalDialogsCount;

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


@@ -42,7 +32,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
 void wxDialog::Init()
 {
     m_returnCode = 0;
 void wxDialog::Init()
 {
     m_returnCode = 0;

-    m_sizeSet = false;

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


@@ -77,15 +66,8 @@ 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 = wxWindow::Show( show );
 


@@ -112,6 +94,13 @@ int wxDialog::ShowModal()
        return GetReturnCode();
     }
 
        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) )
     // use the apps top level window as parent if none given unless explicitly
     // forbidden
     if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )


@@ -130,16 +119,16 @@ 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();
+    wxGUIEventLoop().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,7 +139,7 @@ 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;
     }
 
         return;
     }