additions for wxFileDataObject from Ricky Gonzales <gonzales@pyramid3.net>

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 0deadd900a27c1c89424d3bb89f1a182247a8bdb..0ded488a510711f199ee29a208518f58901dae34 100644 (file)
--- 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
@@ -278,12 +278,12 @@ void wxDialog::GetPosition(int *x, int *y) const
 
 bool wxDialog::IsShown() const
 {
-  return wxModalDialogs.Find(this);
+  return m_isShown;
 }
 
 bool wxDialog::IsModal() const
 {
-    return wxModalDialogs.
+    return wxModalDialogs.Find((wxDialog *)this) != 0; // const_cast
 }
 
 bool wxDialog::Show(bool show)
@@ -474,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;