disable eVC makefiles for sockets (no CLI targets possible on this platform)

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

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 056a469fea74c21b83ddde63d15c10067115707a..7a4f9e300917bb366ccd89d5e8bf495456d54c8e 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 );
 


@@ -137,7 +119,7 @@ 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);


@@ -146,7 +128,7 @@ int wxDialog::ShowModal()
 
     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();
 }