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

Combine new extra styles with old ones since some ports use

Browse Source 
this for internal implementation


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@27735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-06-10 20:40:43 +00:00
parent c315428388
commit e38223714c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/src/xrc/xmlres.cpp
View File

@@ -1097,7 +1097,7 @@ void wxXmlResourceHandler::SetupWindow(wxWindow *wnd)
//FIXME : add cursor
if (HasParam(wxT("exstyle")))
wnd->SetExtraStyle(GetStyle(wxT("exstyle")));
wnd->SetExtraStyle(wnd->GetExtraStyle()|GetStyle(wxT("exstyle")));
if (HasParam(wxT("bg")))
wnd->SetBackgroundColour(GetColour(wxT("bg")));
if (HasParam(wxT("fg")))

2
src/xrc/xmlres.cpp
View File

@@ -1097,7 +1097,7 @@ void wxXmlResourceHandler::SetupWindow(wxWindow *wnd)
//FIXME : add cursor
if (HasParam(wxT("exstyle")))
wnd->SetExtraStyle(GetStyle(wxT("exstyle")));
wnd->SetExtraStyle(wnd->GetExtraStyle()|GetStyle(wxT("exstyle")));
if (HasParam(wxT("bg")))
wnd->SetBackgroundColour(GetColour(wxT("bg")));
if (HasParam(wxT("fg")))