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

OR extra style with existing value or some implementations will

Browse Source 
have problems (espec. wxGTK modal dialogs closing behaviour)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2004-06-10 13:28:31 +00:00
parent 6258e418a0
commit 0099f3435b
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1127,7 +1127,10 @@ void wxXmlResourceHandler::SetupWindow(wxWindow *wnd)
//FIXME : add cursor //FIXME : add cursor
if (HasParam(wxT("exstyle"))) if (HasParam(wxT("exstyle")))
wnd->SetExtraStyle(GetStyle(wxT("exstyle"))); // Have to OR it with existing style, since
// some implementations (e.g. wxGTK) use the extra style
// during creation
wnd->SetExtraStyle(wnd->GetExtraStyle() | GetStyle(wxT("exstyle")));
if (HasParam(wxT("bg"))) if (HasParam(wxT("bg")))
wnd->SetBackgroundColour(GetColour(wxT("bg"))); wnd->SetBackgroundColour(GetColour(wxT("bg")));
if (HasParam(wxT("fg"))) if (HasParam(wxT("fg")))

5
src/xrc/xmlres.cpp
View File

@ -1127,7 +1127,10 @@ void wxXmlResourceHandler::SetupWindow(wxWindow *wnd)
//FIXME : add cursor //FIXME : add cursor
if (HasParam(wxT("exstyle"))) if (HasParam(wxT("exstyle")))
wnd->SetExtraStyle(GetStyle(wxT("exstyle"))); // Have to OR it with existing style, since
// some implementations (e.g. wxGTK) use the extra style
// during creation
wnd->SetExtraStyle(wnd->GetExtraStyle() | GetStyle(wxT("exstyle")));
if (HasParam(wxT("bg"))) if (HasParam(wxT("bg")))
wnd->SetBackgroundColour(GetColour(wxT("bg"))); wnd->SetBackgroundColour(GetColour(wxT("bg")));
if (HasParam(wxT("fg"))) if (HasParam(wxT("fg")))