moving libiconv and libz into linker flags, as Xcode resolves the links otherwise...

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

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index a7e4fc8aa6515e64290801464923d89522958bc3..cf91fefe54fc4414d70147a72c5f80358c9893b1 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -151,7 +151,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     return true;
 }
 
-bool wxDialog::XmDoCreateTLW(wxWindow* parent,
+bool wxDialog::DoCreate(wxWindow* parent,
                              wxWindowID id,
                              const wxString& title,
                              const wxPoint& pos,
@@ -293,6 +293,14 @@ bool wxDialog::Show( bool show )
 
     m_isShown = show;
 
+    if (show)
+    {
+        // this usually will result in TransferDataToWindow() being called
+        // which will change the controls values so do it before showing as
+        // otherwise we could have some flicker
+        InitDialog();
+    }
+
     if (show)
     {
         if (!wxUSE_INVISIBLE_RESIZE)
@@ -362,6 +370,8 @@ void wxDialog::EndModal(int retCode)
 
     m_modalShowing = false;
     m_eventLoop->Exit();
+
+    SetModal(false);
 }
 
 // Standard buttons