DLLs linking fix wxCharTypeBuffer<T>::NullData

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

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index ebc45066651b51c4f00cb2c2ede4df8b9201b4e2..dcdaec3cbe58352b707c382b4bd238959852d4c3 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -69,7 +69,7 @@ bool wxDialog::Show( bool show )
     if (show && CanDoLayoutAdaptation())
         DoLayoutAdaptation();
 
     if (show && CanDoLayoutAdaptation())
         DoLayoutAdaptation();
 

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

 
     if (show)
         InitDialog();
 
     if (show)
         InitDialog();


@@ -98,11 +98,7 @@ 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" );

 
     // 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
 
     // 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