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

Add support for wxSL_MIN_MAX_LABELS and wxSL_VALUE_LABEL to XRC

Browse Source 
Recognize these flags in wxSlider XRC handler.

Closes #16949.

Closes https://github.com/wxWidgets/wxWidgets/pull/253
This commit is contained in:
ousnius
2016-03-14 12:04:01 +01:00
committed by Vadim Zeitlin
parent 7907711e82
commit c3a2994931
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -66,6 +66,7 @@ All:
All (GUI): All (GUI):
- Add support for wxAuiManager and wxAuiPaneInfo to XRC (Andrea Zanellato). - Add support for wxAuiManager and wxAuiPaneInfo to XRC (Andrea Zanellato).
- Add support for wxSL_MIN_MAX_LABELS and wxSL_VALUE_LABEL to XRC (ousnius).
- Update Scintilla to v3.6.3 (Paul Kulchenko). - Update Scintilla to v3.6.3 (Paul Kulchenko).
wxGTK: wxGTK:

2
src/common/slidercmn.cpp
View File

@@ -66,6 +66,8 @@ wxBEGIN_FLAGS( wxSliderStyle )
wxFLAGS_MEMBER(wxSL_HORIZONTAL) wxFLAGS_MEMBER(wxSL_HORIZONTAL)
wxFLAGS_MEMBER(wxSL_VERTICAL) wxFLAGS_MEMBER(wxSL_VERTICAL)
wxFLAGS_MEMBER(wxSL_AUTOTICKS) wxFLAGS_MEMBER(wxSL_AUTOTICKS)
wxFLAGS_MEMBER(wxSL_MIN_MAX_LABELS)
wxFLAGS_MEMBER(wxSL_VALUE_LABEL)
wxFLAGS_MEMBER(wxSL_LABELS) wxFLAGS_MEMBER(wxSL_LABELS)
wxFLAGS_MEMBER(wxSL_LEFT) wxFLAGS_MEMBER(wxSL_LEFT)
wxFLAGS_MEMBER(wxSL_TOP) wxFLAGS_MEMBER(wxSL_TOP)

2
src/xrc/xh_slidr.cpp
View File

@@ -35,6 +35,8 @@ wxSliderXmlHandler::wxSliderXmlHandler()
XRC_ADD_STYLE(wxSL_HORIZONTAL); XRC_ADD_STYLE(wxSL_HORIZONTAL);
XRC_ADD_STYLE(wxSL_VERTICAL); XRC_ADD_STYLE(wxSL_VERTICAL);
XRC_ADD_STYLE(wxSL_AUTOTICKS); XRC_ADD_STYLE(wxSL_AUTOTICKS);
XRC_ADD_STYLE(wxSL_MIN_MAX_LABELS);
XRC_ADD_STYLE(wxSL_VALUE_LABEL);
XRC_ADD_STYLE(wxSL_LABELS); XRC_ADD_STYLE(wxSL_LABELS);
XRC_ADD_STYLE(wxSL_LEFT); XRC_ADD_STYLE(wxSL_LEFT);
XRC_ADD_STYLE(wxSL_TOP); XRC_ADD_STYLE(wxSL_TOP);