From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 10 Jun 2004 13:28:31 +0000 (+0000)
Subject: OR extra style with existing value or some implementations will
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0099f3435bb7b34bd99c0e98e99e8c730c5ad286

OR extra style with existing value or some implementations will
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
---

diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp
index b7c0bc870e..4d6b486ad6 100644
--- a/contrib/src/xrc/xmlres.cpp
+++ b/contrib/src/xrc/xmlres.cpp
@@ -1127,7 +1127,10 @@ void wxXmlResourceHandler::SetupWindow(wxWindow *wnd)
     //FIXME : add cursor
 
     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")))
         wnd->SetBackgroundColour(GetColour(wxT("bg")));
     if (HasParam(wxT("fg")))
diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index b7c0bc870e..4d6b486ad6 100644
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -1127,7 +1127,10 @@ void wxXmlResourceHandler::SetupWindow(wxWindow *wnd)
     //FIXME : add cursor
 
     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")))
         wnd->SetBackgroundColour(GetColour(wxT("bg")));
     if (HasParam(wxT("fg")))