projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't send wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED when nothing changed.
[wxWidgets.git]
/
include
/
wx
/
slider.h
diff --git
a/include/wx/slider.h
b/include/wx/slider.h
index 6294fabc1a6151d202a3265b9b310868c61b78f3..84896602f958b72dfd48608d28107056c43167ad 100644
(file)
--- a/
include/wx/slider.h
+++ b/
include/wx/slider.h
@@
-31,7
+31,6
@@
#define wxSL_TICKS 0x0010
#define wxSL_AUTOTICKS wxSL_TICKS // we don't support manual ticks
#define wxSL_TICKS 0x0010
#define wxSL_AUTOTICKS wxSL_TICKS // we don't support manual ticks
-#define wxSL_LABELS 0x0020
#define wxSL_LEFT 0x0040
#define wxSL_TOP 0x0080
#define wxSL_RIGHT 0x0100
#define wxSL_LEFT 0x0040
#define wxSL_TOP 0x0080
#define wxSL_RIGHT 0x0100
@@
-39,6
+38,9
@@
#define wxSL_BOTH 0x0400
#define wxSL_SELRANGE 0x0800
#define wxSL_INVERSE 0x1000
#define wxSL_BOTH 0x0400
#define wxSL_SELRANGE 0x0800
#define wxSL_INVERSE 0x1000
+#define wxSL_MIN_MAX_LABELS 0x2000
+#define wxSL_VALUE_LABEL 0x4000
+#define wxSL_LABELS (wxSL_MIN_MAX_LABELS|wxSL_VALUE_LABEL)
#if WXWIN_COMPATIBILITY_2_6
// obsolete
#if WXWIN_COMPATIBILITY_2_6
// obsolete
@@
-118,7
+120,7
@@
protected:
}
private:
}
private:
- DECLARE_NO_COPY_CLASS(wxSliderBase)
+ wxDECLARE_NO_COPY_CLASS(wxSliderBase);
};
// ----------------------------------------------------------------------------
};
// ----------------------------------------------------------------------------
@@
-136,7
+138,7
@@
private:
#elif defined(__WXGTK__)
#include "wx/gtk1/slider.h"
#elif defined(__WXMAC__)
#elif defined(__WXGTK__)
#include "wx/gtk1/slider.h"
#elif defined(__WXMAC__)
- #include "wx/
mac
/slider.h"
+ #include "wx/
osx
/slider.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/slider.h"
#elif defined(__WXPM__)
#elif defined(__WXCOCOA__)
#include "wx/cocoa/slider.h"
#elif defined(__WXPM__)