From 9ca4dd06de4376340efca369e65ee1181375d484 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 2 Mar 2003 18:58:58 +0000 Subject: [PATCH] implemented wxCLOSE_BOX under Windows git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/toplevel.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index 96320bcfef..7e827494bd 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -414,6 +414,8 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, long style, const wxString& name) { + bool ret = false; + // init our fields Init(); @@ -458,15 +460,20 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, if ( style & (wxRESIZE_BORDER | wxCAPTION) ) dlgTemplate->style |= DS_MODALFRAME; - bool ret = CreateDialog(dlgTemplate, title, pos, size); + ret = CreateDialog(dlgTemplate, title, pos, size); free(dlgTemplate); - - return ret; } else // !dialog { - return CreateFrame(title, pos, size); + ret = CreateFrame(title, pos, size); + } + + if ( ret && !(GetWindowStyleFlag() & wxCLOSE_BOX) ) + { + EnableCloseButton(false); } + + return ret; } wxTopLevelWindowMSW::~wxTopLevelWindowMSW() -- 2.47.2