From c3a2994931dfea588a2ffdc29f6aceeb24a7ffa8 Mon Sep 17 00:00:00 2001
From: ousnius <denis41@hotmail.de>
Date: Mon, 14 Mar 2016 12:04:01 +0100
Subject: [PATCH] Add support for wxSL_MIN_MAX_LABELS and wxSL_VALUE_LABEL to
 XRC

Recognize these flags in wxSlider XRC handler.

Closes #16949.

Closes https://github.com/wxWidgets/wxWidgets/pull/253
---
 docs/changes.txt         | 1 +
 src/common/slidercmn.cpp | 2 ++
 src/xrc/xh_slidr.cpp     | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/docs/changes.txt b/docs/changes.txt
index a7fb5917f5..26b24e25d3 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -66,6 +66,7 @@ All:
 All (GUI):
 
 - 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).
 
 wxGTK:
diff --git a/src/common/slidercmn.cpp b/src/common/slidercmn.cpp
index d5ce262db3..1421cbc6ed 100644
--- a/src/common/slidercmn.cpp
+++ b/src/common/slidercmn.cpp
@@ -66,6 +66,8 @@ wxBEGIN_FLAGS( wxSliderStyle )
     wxFLAGS_MEMBER(wxSL_HORIZONTAL)
     wxFLAGS_MEMBER(wxSL_VERTICAL)
     wxFLAGS_MEMBER(wxSL_AUTOTICKS)
+    wxFLAGS_MEMBER(wxSL_MIN_MAX_LABELS)
+    wxFLAGS_MEMBER(wxSL_VALUE_LABEL)
     wxFLAGS_MEMBER(wxSL_LABELS)
     wxFLAGS_MEMBER(wxSL_LEFT)
     wxFLAGS_MEMBER(wxSL_TOP)
diff --git a/src/xrc/xh_slidr.cpp b/src/xrc/xh_slidr.cpp
index 260c743d19..7b1702ae5c 100644
--- a/src/xrc/xh_slidr.cpp
+++ b/src/xrc/xh_slidr.cpp
@@ -35,6 +35,8 @@ wxSliderXmlHandler::wxSliderXmlHandler()
     XRC_ADD_STYLE(wxSL_HORIZONTAL);
     XRC_ADD_STYLE(wxSL_VERTICAL);
     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_LEFT);
     XRC_ADD_STYLE(wxSL_TOP);