Applied #9789: missing wxBORDER_THEME style in XRC

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 166dfac4c12922669131b36fbac1b24a5b666686..373a5249776387a67fa9f7f2e2b3dbe5f95e75cf 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -153,6 +153,8 @@ Changes in behaviour not resulting in compilation errors, please read this!
   and not in both this and the orthogonal directions. This behaviour is what
   most of the people expect but if you really relied on this overload adding
   space in both directions you should change your code to use AddSpacer(x, x).
+  
+- wxTextCtrl::LoadFile no longer sends a text update event.
 
 
 Changes in behaviour which may result in compilation errors
@@ -352,6 +354,8 @@ Major new features in this release
 
 - New propgrid library containing wxPropertyGrid and related classes.
 
+- new ribbon library for advanced toolbars.
+
 - Many enhancements to wxDataViewCtrl.
 
 - Event loops, timers and sockets can now be used in wxBase, without GUI.
@@ -430,6 +434,7 @@ All (GUI):
 - wxRTC: added wxRICHTEXT_HANDLER_USE_CSS flag for HTML handler to use CSS
   where possible.
 - wxRTC: corrected centring and right-justification spacing.
+- Added wxBORDER_THEME to XRC.
 
 GTK:
 

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index dac420862eca800c7b0ddb52410c4b5f2a0ee549..5b41a453aa18fff42899d09a1c837c9d9e40fe67 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -1028,7 +1028,8 @@ void wxXmlResourceHandler::AddWindowStyles()
     // the border styles all have the old and new names, recognize both for now
     XRC_ADD_STYLE(wxSIMPLE_BORDER); XRC_ADD_STYLE(wxBORDER_SIMPLE);
     XRC_ADD_STYLE(wxSUNKEN_BORDER); XRC_ADD_STYLE(wxBORDER_SUNKEN);
-    XRC_ADD_STYLE(wxDOUBLE_BORDER); XRC_ADD_STYLE(wxBORDER_DOUBLE);
+    XRC_ADD_STYLE(wxDOUBLE_BORDER); XRC_ADD_STYLE(wxBORDER_DOUBLE); // deprecated
+    XRC_ADD_STYLE(wxBORDER_THEME);
     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);