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

backported style flags fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-09-13 11:05:52 +00:00
parent f8480f281c
commit e59fcce8b5
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/src/xrc/xh_unkwn.cpp
View File

@@ -34,8 +34,10 @@ public:
wxWindowID id = -1, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL | wxNO_BORDER) long style = 0)
: wxPanel(parent, id, pos, size, style, // Always add the wxTAB_TRAVERSAL and wxNO_BORDER styles to what comes
// from the XRC if anything.
: wxPanel(parent, id, pos, size, style | wxTAB_TRAVERSAL | wxNO_BORDER,
controlName + wxT("_container")), controlName + wxT("_container")),
m_controlName(controlName), m_controlAdded(FALSE) m_controlName(controlName), m_controlAdded(FALSE)
{ {
@@ -89,8 +91,7 @@ wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
new wxUnknownControlContainer(m_parentAsWindow, new wxUnknownControlContainer(m_parentAsWindow,
GetName(), -1, GetName(), -1,
GetPosition(), GetSize(), GetPosition(), GetSize(),
GetStyle(wxT("style"), GetStyle(wxT("style")));
wxTAB_TRAVERSAL | wxNO_BORDER));
SetupWindow(panel); SetupWindow(panel);
return panel; return panel;
} }

9
src/xrc/xh_unkwn.cpp
View File

@@ -34,8 +34,10 @@ public:
wxWindowID id = -1, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL | wxNO_BORDER) long style = 0)
: wxPanel(parent, id, pos, size, style, // Always add the wxTAB_TRAVERSAL and wxNO_BORDER styles to what comes
// from the XRC if anything.
: wxPanel(parent, id, pos, size, style | wxTAB_TRAVERSAL | wxNO_BORDER,
controlName + wxT("_container")), controlName + wxT("_container")),
m_controlName(controlName), m_controlAdded(FALSE) m_controlName(controlName), m_controlAdded(FALSE)
{ {
@@ -89,8 +91,7 @@ wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
new wxUnknownControlContainer(m_parentAsWindow, new wxUnknownControlContainer(m_parentAsWindow,
GetName(), -1, GetName(), -1,
GetPosition(), GetSize(), GetPosition(), GetSize(),
GetStyle(wxT("style"), GetStyle(wxT("style")));
wxTAB_TRAVERSAL | wxNO_BORDER));
SetupWindow(panel); SetupWindow(panel);
return panel; return panel;
} }