added wxTLW for MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -163,10 +163,6 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
|
||||
long style,
|
||||
const wxString& name)
|
||||
{
|
||||
m_defaultIcon = (WXHICON) (wxSTD_MDIPARENTFRAME_ICON
|
||||
? wxSTD_MDIPARENTFRAME_ICON
|
||||
: wxDEFAULT_MDIPARENTFRAME_ICON);
|
||||
|
||||
m_clientWindow = NULL;
|
||||
m_currentChild = NULL;
|
||||
|
||||
@@ -349,6 +345,12 @@ void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
|
||||
event.Skip();
|
||||
}
|
||||
|
||||
WXHICON wxMDIParentFrame::GetDefaultIcon() const
|
||||
{
|
||||
return (WXHICON)(wxSTD_MDIPARENTFRAME_ICON ? wxSTD_MDIPARENTFRAME_ICON
|
||||
: wxDEFAULT_MDIPARENTFRAME_ICON);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// MDI operations
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -647,9 +649,6 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
|
||||
long style,
|
||||
const wxString& name)
|
||||
{
|
||||
m_defaultIcon = (WXHICON)(wxSTD_MDICHILDFRAME_ICON ? wxSTD_MDICHILDFRAME_ICON
|
||||
: wxDEFAULT_MDICHILDFRAME_ICON);
|
||||
|
||||
SetName(name);
|
||||
wxWindowBase::Show(TRUE); // MDI child frame starts off shown
|
||||
|
||||
@@ -814,6 +813,12 @@ void wxMDIChildFrame::InternalSetMenuBar()
|
||||
parent->m_parentFrameActive = FALSE;
|
||||
}
|
||||
|
||||
WXHICON wxMDIChildFrame::GetDefaultIcon() const
|
||||
{
|
||||
return (WXHICON)(wxSTD_MDICHILDFRAME_ICON ? wxSTD_MDICHILDFRAME_ICON
|
||||
: wxDEFAULT_MDICHILDFRAME_ICON);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// MDI operations
|
||||
// ---------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user