VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index dde02e52a8f4daa728c8842223ce669970ef88c2..0ded488a510711f199ee29a208518f58901dae34 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -123,12 +123,12 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     // resizeable or not (but a resizeable dialog always has caption -
     // otherwise it would look too strange)
     const wxChar *dlg;
     // resizeable or not (but a resizeable dialog always has caption -
     // otherwise it would look too strange)
     const wxChar *dlg;

-    if ( style & wxTHICK_FRAME )
-        dlg = _T("wxResizeableDialog");
+    if ( style & wxRESIZE_BORDER )
+        dlg = wxT("wxResizeableDialog");

     else if ( style & wxCAPTION )
     else if ( style & wxCAPTION )

-        dlg = _T("wxCaptionDialog");
+        dlg = wxT("wxCaptionDialog");

     else
     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
     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;
 }
 
   return m_isShown;
 }
 

+bool wxDialog::IsModal() const
+{
+    return wxModalDialogs.Find((wxDialog *)this) != 0; // const_cast
+}
+

 bool wxDialog::Show(bool show)
 {
   m_isShown = show;
 bool wxDialog::Show(bool show)
 {
   m_isShown = show;


@@ -469,7 +474,9 @@ bool wxDialog::Show(bool show)
         if (hWndParent)
           ::BringWindowToTop(hWndParent);
       }
         if (hWndParent)
           ::BringWindowToTop(hWndParent);
       }

-      ShowWindow((HWND) GetHWND(), SW_HIDE);
+
+      if ( m_hWnd )
+        ShowWindow((HWND) GetHWND(), SW_HIDE);

     }
   }
   return TRUE;
     }
   }
   return TRUE;