X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e082993210088cdb82c8cd4d471a1c5f04f643b..4a46a5df879c4f820d0a0a435b34c7d5e4793991:/src/msw/toplevel.cpp?ds=inline

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 449a0973ff..e77677c7d4 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -106,6 +106,10 @@ long wxTopLevelWindowMSW::MSWGetCreateWindowFlags(long *exflags) const
     long style = GetWindowStyle();
 
     // first select the kind of window being created
+    //
+    // note that if we don't set WS_POPUP, Windows assumes WS_OVERLAPPED and
+    // creates a window with both caption and border, hence we also test it
+    // below in some other cases
     long msflags;
     if ( style & wxFRAME_TOOL_WINDOW )
         msflags = WS_POPUP;
@@ -117,16 +121,13 @@ long wxTopLevelWindowMSW::MSWGetCreateWindowFlags(long *exflags) const
         msflags |= WS_THICKFRAME;
     else if ( !(style & wxBORDER_NONE) )
         msflags |= WS_BORDER;
+    else
+        msflags |= WS_POPUP;
 
     if ( style & wxCAPTION )
         msflags |= WS_CAPTION;
-
-    // if we don't set WS_POPUP, Windows assumes WS_OVERLAPPED and creates a
-    // window with both caption and border
-    if ( msflags & (WS_CAPTION | WS_BORDER) != WS_CAPTION | WS_BORDER )
-    {
+    else
         msflags |= WS_POPUP;
-    }
 
     // next translate the individual flags
     if ( style & wxMINIMIZE_BOX )
@@ -184,7 +185,7 @@ long wxTopLevelWindowMSW::MSWGetCreateWindowFlags(long *exflags) const
     return msflags;
 }
 
-bool wxTopLevelWindowMSW::CreateDialog(const wxChar *dlgTemplate,
+bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
                                        const wxString& title,
                                        const wxPoint& pos,
                                        const wxSize& size)
@@ -217,16 +218,16 @@ bool wxTopLevelWindowMSW::CreateDialog(const wxChar *dlgTemplate,
         }
     }
 
-    m_hWnd = (WXHWND)::CreateDialog(wxGetInstance(),
-                                    dlgTemplate,
+    m_hWnd = (WXHWND)::CreateDialogIndirect(wxGetInstance(),
+                                    (DLGTEMPLATE*)dlgTemplate,
                                     parent ? GetHwndOf(parent) : NULL,
                                     (DLGPROC)wxDlgProc);
 
     if ( !m_hWnd )
     {
-        wxFAIL_MSG(_("Did you forget to include wx/msw/wx.rc in your resources?"));
+        wxFAIL_MSG(_("Failed to create dialog. Incorrect DLGTEMPLATE?"));
 
-        wxLogSysError(_("Can't create dialog using template '%s'"), dlgTemplate);
+        wxLogSysError(_("Can't create dialog using memory template"));
 
         return FALSE;
     }
@@ -357,15 +358,24 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
         // with & without captions under MSWindows, resizeable or not (but a
         // resizeable dialog always has caption - otherwise it would look too
         // strange)
-        const wxChar *dlgTemplate;
+        int dlgsize = sizeof(DLGTEMPLATE) + (sizeof(WORD) * 3);
+        DLGTEMPLATE* dlgTemplate = (DLGTEMPLATE*)malloc( dlgsize );
+        memset (dlgTemplate, 0, dlgsize );
+        dlgTemplate->x  = 34;
+        dlgTemplate->y  = 22;
+        dlgTemplate->cx = 144;
+        dlgTemplate->cy = 75;
+
         if ( style & wxRESIZE_BORDER )
-            dlgTemplate = wxT("wxResizeableDialog");
+          dlgTemplate->style = DS_MODALFRAME | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_THICKFRAME;
         else if ( style & wxCAPTION )
-            dlgTemplate = wxT("wxCaptionDialog");
+          dlgTemplate->style = DS_MODALFRAME | WS_CAPTION | WS_POPUP | WS_SYSMENU;
         else
-            dlgTemplate = wxT("wxNoCaptionDialog");
+          dlgTemplate->style = WS_POPUP;
 
-        return CreateDialog(dlgTemplate, title, pos, size);
+        bool ret = CreateDialog(dlgTemplate, title, pos, size);
+        free(dlgTemplate);
+        return ret;
     }
     else // !dialog
     {