From e38223714c9b30a6ca90df9f24e255dba1ab97c1 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 10 Jun 2004 20:40:43 +0000 Subject: [PATCH] Combine new extra styles with old ones since some ports use 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 --- contrib/src/xrc/xmlres.cpp | 2 +- src/xrc/xmlres.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp index 937cddda4e..34c7f505e4 100644 --- a/contrib/src/xrc/xmlres.cpp +++ b/contrib/src/xrc/xmlres.cpp @@ -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"))) diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index 937cddda4e..34c7f505e4 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -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")))