X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/257bf51016686d1ef0a4dfe7228ab5ea65b85887..f38374d0d7aa865e9bbe8ee61b75b94ffcdfb220:/src/msw/dialog.cpp?ds=sidebyside

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 44cd609ee9..0ded488a51 100644
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -124,11 +124,11 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     // otherwise it would look too strange)
     const wxChar *dlg;
     if ( style & wxRESIZE_BORDER )
-        dlg = _T("wxResizeableDialog");
+        dlg = wxT("wxResizeableDialog");
     else if ( style & wxCAPTION )
-        dlg = _T("wxCaptionDialog");
+        dlg = wxT("wxCaptionDialog");
     else
-        dlg = _T("wxNoCaptionDialog");
+        dlg = wxT("wxNoCaptionDialog");
     MSWCreate(m_windowId, parent, NULL, this, NULL,
               x, y, width, height,
               0, // style is not used if we have dlg template
@@ -281,6 +281,11 @@ bool wxDialog::IsShown() const
   return m_isShown;
 }
 
+bool wxDialog::IsModal() const
+{
+    return wxModalDialogs.Find((wxDialog *)this) != 0; // const_cast
+}
+
 bool wxDialog::Show(bool show)
 {
   m_isShown = show;
@@ -469,7 +474,9 @@ bool wxDialog::Show(bool show)
         if (hWndParent)
           ::BringWindowToTop(hWndParent);
       }
-      ShowWindow((HWND) GetHWND(), SW_HIDE);
+
+      if ( m_hWnd )
+        ShowWindow((HWND) GetHWND(), SW_HIDE);
     }
   }
   return TRUE;