unknown container now accepts wxNO_FULL_REPAINT_ON_RESIZE flag (John Anderson)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -33,8 +33,9 @@ public:
|
|||||||
const wxString& controlName,
|
const wxString& controlName,
|
||||||
wxWindowID id = -1,
|
wxWindowID id = -1,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size = wxDefaultSize)
|
const wxSize& size = wxDefaultSize,
|
||||||
: wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL | wxNO_BORDER,
|
long style = wxTAB_TRAVERSAL | wxNO_BORDER)
|
||||||
|
: wxPanel(parent, id, pos, size, style,
|
||||||
controlName + wxT("_container")),
|
controlName + wxT("_container")),
|
||||||
m_controlName(controlName), m_controlAdded(FALSE)
|
m_controlName(controlName), m_controlAdded(FALSE)
|
||||||
{
|
{
|
||||||
@@ -79,6 +80,7 @@ void wxUnknownControlContainer::RemoveChild(wxWindowBase *child)
|
|||||||
wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()
|
wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()
|
||||||
: wxXmlResourceHandler()
|
: wxXmlResourceHandler()
|
||||||
{
|
{
|
||||||
|
XRC_ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
|
||||||
}
|
}
|
||||||
|
|
||||||
wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
|
wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
|
||||||
@@ -86,7 +88,9 @@ wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
|
|||||||
wxPanel *panel =
|
wxPanel *panel =
|
||||||
new wxUnknownControlContainer(m_parentAsWindow,
|
new wxUnknownControlContainer(m_parentAsWindow,
|
||||||
GetName(), -1,
|
GetName(), -1,
|
||||||
GetPosition(), GetSize());
|
GetPosition(), GetSize(),
|
||||||
|
GetStyle(wxT("style"),
|
||||||
|
wxTAB_TRAVERSAL | wxNO_BORDER));
|
||||||
SetupWindow(panel);
|
SetupWindow(panel);
|
||||||
return panel;
|
return panel;
|
||||||
}
|
}
|
||||||
|
@@ -33,8 +33,9 @@ public:
|
|||||||
const wxString& controlName,
|
const wxString& controlName,
|
||||||
wxWindowID id = -1,
|
wxWindowID id = -1,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size = wxDefaultSize)
|
const wxSize& size = wxDefaultSize,
|
||||||
: wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL | wxNO_BORDER,
|
long style = wxTAB_TRAVERSAL | wxNO_BORDER)
|
||||||
|
: wxPanel(parent, id, pos, size, style,
|
||||||
controlName + wxT("_container")),
|
controlName + wxT("_container")),
|
||||||
m_controlName(controlName), m_controlAdded(FALSE)
|
m_controlName(controlName), m_controlAdded(FALSE)
|
||||||
{
|
{
|
||||||
@@ -79,6 +80,7 @@ void wxUnknownControlContainer::RemoveChild(wxWindowBase *child)
|
|||||||
wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()
|
wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()
|
||||||
: wxXmlResourceHandler()
|
: wxXmlResourceHandler()
|
||||||
{
|
{
|
||||||
|
XRC_ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
|
||||||
}
|
}
|
||||||
|
|
||||||
wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
|
wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
|
||||||
@@ -86,7 +88,9 @@ wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
|
|||||||
wxPanel *panel =
|
wxPanel *panel =
|
||||||
new wxUnknownControlContainer(m_parentAsWindow,
|
new wxUnknownControlContainer(m_parentAsWindow,
|
||||||
GetName(), -1,
|
GetName(), -1,
|
||||||
GetPosition(), GetSize());
|
GetPosition(), GetSize(),
|
||||||
|
GetStyle(wxT("style"),
|
||||||
|
wxTAB_TRAVERSAL | wxNO_BORDER));
|
||||||
SetupWindow(panel);
|
SetupWindow(panel);
|
||||||
return panel;
|
return panel;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user