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

Applied #9789: missing wxBORDER_THEME style in XRC

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2009-09-24 15:36:43 +00:00
parent b14cd77b2a
commit b37e592bd7
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/changes.txt
View File

@@ -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 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 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). 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 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 propgrid library containing wxPropertyGrid and related classes.
- new ribbon library for advanced toolbars.
- Many enhancements to wxDataViewCtrl. - Many enhancements to wxDataViewCtrl.
- Event loops, timers and sockets can now be used in wxBase, without GUI. - 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 - wxRTC: added wxRICHTEXT_HANDLER_USE_CSS flag for HTML handler to use CSS
where possible. where possible.
- wxRTC: corrected centring and right-justification spacing. - wxRTC: corrected centring and right-justification spacing.
- Added wxBORDER_THEME to XRC.
GTK: GTK:

3
src/xrc/xmlres.cpp
View File

@@ -1028,7 +1028,8 @@ void wxXmlResourceHandler::AddWindowStyles()
// the border styles all have the old and new names, recognize both for now // 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(wxSIMPLE_BORDER); XRC_ADD_STYLE(wxBORDER_SIMPLE);
XRC_ADD_STYLE(wxSUNKEN_BORDER); XRC_ADD_STYLE(wxBORDER_SUNKEN); 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(wxRAISED_BORDER); XRC_ADD_STYLE(wxBORDER_RAISED);
XRC_ADD_STYLE(wxSTATIC_BORDER); XRC_ADD_STYLE(wxBORDER_STATIC); XRC_ADD_STYLE(wxSTATIC_BORDER); XRC_ADD_STYLE(wxBORDER_STATIC);
XRC_ADD_STYLE(wxNO_BORDER); XRC_ADD_STYLE(wxBORDER_NONE); XRC_ADD_STYLE(wxNO_BORDER); XRC_ADD_STYLE(wxBORDER_NONE);