Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Not all implementations of wxMDIChildFrame derive from wxFrame

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-04-03 09:24:04 +00:00
parent 4cc52142b8
commit 6def7a17b0
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/xrc/xh_mdi.h
View File

@@ -19,7 +19,7 @@
#if wxUSE_MDI #if wxUSE_MDI
class WXDLLIMPEXP_CORE wxFrame; class WXDLLIMPEXP_CORE wxWindow;
class WXDLLIMPEXP_XRC wxMdiXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxMdiXmlHandler : public wxXmlResourceHandler
{ {
@@ -29,7 +29,7 @@ public:
virtual bool CanHandle(wxXmlNode *node); virtual bool CanHandle(wxXmlNode *node);
private: private:
wxFrame *CreateFrame(); wxWindow *CreateFrame();
DECLARE_DYNAMIC_CLASS(wxMdiXmlHandler) DECLARE_DYNAMIC_CLASS(wxMdiXmlHandler)
}; };

15
src/xrc/xh_mdi.cpp
View File

@@ -62,13 +62,13 @@ wxMdiXmlHandler::wxMdiXmlHandler() : wxXmlResourceHandler()
AddWindowStyles(); AddWindowStyles();
} }
wxFrame *wxMdiXmlHandler::CreateFrame() wxWindow *wxMdiXmlHandler::CreateFrame()
{ {
if (m_class == wxT("wxMDIParentFrame")) if (m_class == wxT("wxMDIParentFrame"))
{ {
XRC_MAKE_INSTANCE(frame, wxMDIParentFrame); XRC_MAKE_INSTANCE(frame, wxMDIParentFrame);
frame->Create(m_parentAsWindow, ((wxMDIParentFrame*)frame)->Create(m_parentAsWindow,
GetID(), GetID(),
GetText(wxT("title")), GetText(wxT("title")),
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
@@ -86,7 +86,7 @@ wxFrame *wxMdiXmlHandler::CreateFrame()
XRC_MAKE_INSTANCE(frame, wxMDIChildFrame); XRC_MAKE_INSTANCE(frame, wxMDIChildFrame);
frame->Create(mdiParent, ((wxMDIChildFrame*) frame)->Create(mdiParent,
GetID(), GetID(),
GetText(wxT("title")), GetText(wxT("title")),
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
@@ -99,14 +99,17 @@ wxFrame *wxMdiXmlHandler::CreateFrame()
wxObject *wxMdiXmlHandler::DoCreateResource() wxObject *wxMdiXmlHandler::DoCreateResource()
{ {
wxFrame *frame = CreateFrame(); wxWindow *frame = CreateFrame();
if (HasParam(wxT("size"))) if (HasParam(wxT("size")))
frame->SetClientSize(GetSize()); frame->SetClientSize(GetSize());
if (HasParam(wxT("pos"))) if (HasParam(wxT("pos")))
frame->Move(GetPosition()); frame->Move(GetPosition());
if (HasParam(wxT("icon"))) if (HasParam(wxT("icon")) && frame->IsKindOf(CLASSINFO(wxFrame)))
frame->SetIcon(GetIcon(wxT("icon"), wxART_FRAME_ICON)); {
wxFrame* f = wxDynamicCast(f, wxFrame);
f->SetIcon(GetIcon(wxT("icon"), wxART_FRAME_ICON));
}
SetupWindow(frame); SetupWindow(frame);