implemented wxCLOSE_BOX under Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -414,6 +414,8 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
|
|||||||
long style,
|
long style,
|
||||||
const wxString& name)
|
const wxString& name)
|
||||||
{
|
{
|
||||||
|
bool ret = false;
|
||||||
|
|
||||||
// init our fields
|
// init our fields
|
||||||
Init();
|
Init();
|
||||||
|
|
||||||
@@ -458,15 +460,20 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
|
|||||||
if ( style & (wxRESIZE_BORDER | wxCAPTION) )
|
if ( style & (wxRESIZE_BORDER | wxCAPTION) )
|
||||||
dlgTemplate->style |= DS_MODALFRAME;
|
dlgTemplate->style |= DS_MODALFRAME;
|
||||||
|
|
||||||
bool ret = CreateDialog(dlgTemplate, title, pos, size);
|
ret = CreateDialog(dlgTemplate, title, pos, size);
|
||||||
free(dlgTemplate);
|
free(dlgTemplate);
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
else // !dialog
|
else // !dialog
|
||||||
{
|
{
|
||||||
return CreateFrame(title, pos, size);
|
ret = CreateFrame(title, pos, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( ret && !(GetWindowStyleFlag() & wxCLOSE_BOX) )
|
||||||
|
{
|
||||||
|
EnableCloseButton(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxTopLevelWindowMSW::~wxTopLevelWindowMSW()
|
wxTopLevelWindowMSW::~wxTopLevelWindowMSW()
|
||||||
|
Reference in New Issue
Block a user