From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 19 Oct 2012 22:02:38 +0000 (+0000)
Subject: Add missing styles support to wxWindow XRC handler.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/15b467a57f06619c7bc6241a36868b1668905eab

Add missing styles support to wxWindow XRC handler.

wxBORDER_RAISED, wx[HV]SCROLL and a few extended styles were not recognized.

See #14766.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/docs/changes.txt b/docs/changes.txt
index 6688351757..aa5fafda43 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -571,6 +571,7 @@ All (GUI):
 - Add wxTreeCtrl::EnableBellOnNoMatch() (Jonathan Dagresta).
 - Implement incremental search in wxGenericListCtrl (Jonathan Dagresta).
 - Make TAB behaviour in wxGrid more flexible (Fulvio Senore).
+- Add missing styles support to wxWindow XRC hanlder (Steffen Olszewski).
 
 wxGTK:
 
diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 8e41d39e5e..3e8a5a6a3a 100644
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -1482,15 +1482,23 @@ void wxXmlResourceHandler::AddWindowStyles()
     XRC_ADD_STYLE(wxRAISED_BORDER); XRC_ADD_STYLE(wxBORDER_RAISED);
     XRC_ADD_STYLE(wxSTATIC_BORDER); XRC_ADD_STYLE(wxBORDER_STATIC);
     XRC_ADD_STYLE(wxNO_BORDER);     XRC_ADD_STYLE(wxBORDER_NONE);
+    XRC_ADD_STYLE(wxBORDER_DEFAULT);
 
     XRC_ADD_STYLE(wxTRANSPARENT_WINDOW);
     XRC_ADD_STYLE(wxWANTS_CHARS);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
     XRC_ADD_STYLE(wxFULL_REPAINT_ON_RESIZE);
+    XRC_ADD_STYLE(wxVSCROLL);
+    XRC_ADD_STYLE(wxHSCROLL);
     XRC_ADD_STYLE(wxALWAYS_SHOW_SB);
+
     XRC_ADD_STYLE(wxWS_EX_BLOCK_EVENTS);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
+    XRC_ADD_STYLE(wxWS_EX_TRANSIENT);
+    XRC_ADD_STYLE(wxWS_EX_CONTEXTHELP);
+    XRC_ADD_STYLE(wxWS_EX_PROCESS_IDLE);
+    XRC_ADD_STYLE(wxWS_EX_PROCESS_UI_UPDATES);
 }