Commit of merge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -93,6 +93,12 @@ bool wxDialog::Create(
|
|||||||
))
|
))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
|
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
|
||||||
|
|
||||||
|
//
|
||||||
|
// Must defer setting the title until after dialog is created and sized
|
||||||
|
//
|
||||||
|
if (!rsTitle.IsNull())
|
||||||
|
SetTitle(rsTitle);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
} // end of wxDialog::Create
|
} // end of wxDialog::Create
|
||||||
|
|
||||||
@@ -265,6 +271,8 @@ bool wxDialog::Show(
|
|||||||
InitDialog();
|
InitDialog();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (GetTitle().c_str())
|
||||||
|
::WinSetWindowText((HWND)GetHwnd(), GetTitle().c_str());
|
||||||
if (IsModal())
|
if (IsModal())
|
||||||
{
|
{
|
||||||
if (bShow)
|
if (bShow)
|
||||||
|
Reference in New Issue
Block a user