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

don't use m_instanceAsWindow to convert dialog units, it's not fully constructed yet and can't provide the information

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-10-16 21:52:54 +00:00
parent fa4a69423d
commit 9a8d8c5a51
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/xrc/xmlres.h
View File

@@ -341,7 +341,7 @@ protected:
wxXmlNode *m_node; wxXmlNode *m_node;
wxString m_class; wxString m_class;
wxObject *m_parent, *m_instance; wxObject *m_parent, *m_instance;
wxWindow *m_parentAsWindow, *m_instanceAsWindow; wxWindow *m_parentAsWindow;
// --- Handy methods: // --- Handy methods:

15
src/xrc/xmlres.cpp
View File

@@ -652,7 +652,7 @@ public:
wxXmlResourceHandler::wxXmlResourceHandler() wxXmlResourceHandler::wxXmlResourceHandler()
: m_node(NULL), m_parent(NULL), m_instance(NULL), : m_node(NULL), m_parent(NULL), m_instance(NULL),
m_parentAsWindow(NULL), m_instanceAsWindow(NULL) m_parentAsWindow(NULL)
{} {}
@@ -662,7 +662,7 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent
wxXmlNode *myNode = m_node; wxXmlNode *myNode = m_node;
wxString myClass = m_class; wxString myClass = m_class;
wxObject *myParent = m_parent, *myInstance = m_instance; wxObject *myParent = m_parent, *myInstance = m_instance;
wxWindow *myParentAW = m_parentAsWindow, *myInstanceAW = m_instanceAsWindow; wxWindow *myParentAW = m_parentAsWindow;
m_instance = instance; m_instance = instance;
if (!m_instance && node->HasProp(wxT("subclass")) && if (!m_instance && node->HasProp(wxT("subclass")) &&
@@ -692,14 +692,13 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent
m_class = node->GetPropVal(wxT("class"), wxEmptyString); m_class = node->GetPropVal(wxT("class"), wxEmptyString);
m_parent = parent; m_parent = parent;
m_parentAsWindow = wxDynamicCast(m_parent, wxWindow); m_parentAsWindow = wxDynamicCast(m_parent, wxWindow);
m_instanceAsWindow = wxDynamicCast(m_instance, wxWindow);
wxObject *returned = DoCreateResource(); wxObject *returned = DoCreateResource();
m_node = myNode; m_node = myNode;
m_class = myClass; m_class = myClass;
m_parent = myParent; m_parentAsWindow = myParentAW; m_parent = myParent; m_parentAsWindow = myParentAW;
m_instance = myInstance; m_instanceAsWindow = myInstanceAW; m_instance = myInstance;
return returned; return returned;
} }
@@ -1034,9 +1033,7 @@ wxSize wxXmlResourceHandler::GetSize(const wxString& param)
if (is_dlg) if (is_dlg)
{ {
if (m_instanceAsWindow) if (m_parentAsWindow)
return wxDLG_UNIT(m_instanceAsWindow, wxSize(sx, sy));
else if (m_parentAsWindow)
return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, sy)); return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, sy));
else else
{ {
@@ -1075,9 +1072,7 @@ wxCoord wxXmlResourceHandler::GetDimension(const wxString& param, wxCoord defaul
if (is_dlg) if (is_dlg)
{ {
if (m_instanceAsWindow) if (m_parentAsWindow)
return wxDLG_UNIT(m_instanceAsWindow, wxSize(sx, 0)).x;
else if (m_parentAsWindow)
return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, 0)).x; return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, 0)).x;
else else
{ {