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

moved wxSL_XXX styles to wx/slider.h; made wxSL_LEFT/RIGHT == wxSL_TOP/BOTTOM | wxSL_VERTICAL

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-04-10 17:06:49 +00:00
parent fe1bc2853c
commit 86745a19d0
2 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/wx/defs.h
View File

@@ -1151,10 +1151,11 @@ enum wxGeometryCentre
enum wxOrientation enum wxOrientation
{ {
// don't change the values of th4ese elements, they are used elsewhere
wxHORIZONTAL = 0x0004, wxHORIZONTAL = 0x0004,
wxVERTICAL = 0x0008, wxVERTICAL = 0x0008,
wxBOTH = (wxVERTICAL | wxHORIZONTAL) wxBOTH = wxVERTICAL | wxHORIZONTAL
}; };
enum wxDirection enum wxDirection
@@ -1443,24 +1444,6 @@ enum wxBorder
#define wxRB_SINGLE 0x0008 #define wxRB_SINGLE 0x0008
#define wxRB_USE_CHECKBOX 0x0010 /* alternative native control (wxPalmOS) */ #define wxRB_USE_CHECKBOX 0x0010 /* alternative native control (wxPalmOS) */
/*
* wxSlider flags
*/
#define wxSL_HORIZONTAL wxHORIZONTAL /* 4 */
#define wxSL_VERTICAL wxVERTICAL /* 8 */
/* The next one is obsolete - use scroll events instead */
#define wxSL_NOTIFY_DRAG 0x0000
#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_BOTTOM 0x0200
#define wxSL_BOTH 0x0400
#define wxSL_SELRANGE 0x0800
#define wxSL_INVERSE 0x1000
/* /*
* wxScrollBar flags * wxScrollBar flags
*/ */

22
include/wx/slider.h
View File

@@ -22,6 +22,28 @@
#include "wx/control.h" #include "wx/control.h"
// ----------------------------------------------------------------------------
// wxSlider flags
// ----------------------------------------------------------------------------
#define wxSL_HORIZONTAL wxHORIZONTAL /* 0x0004 */
#define wxSL_VERTICAL wxVERTICAL /* 0x0008 */
#define wxSL_TICKS 0x0010
#define wxSL_AUTOTICKS wxSL_TICKS // we don't support manual ticks
#define wxSL_LABELS 0x0020
#define wxSL_TOP 0x0080
#define wxSL_LEFT (wxSL_TOP | wxVERTICAL)
#define wxSL_BOTTOM 0x0200
#define wxSL_RIGHT (wxSL_BOTTOM | wxVERTICAL)
#define wxSL_BOTH 0x0400
#define wxSL_SELRANGE 0x0800
#define wxSL_INVERSE 0x1000
// obsolete
#define wxSL_NOTIFY_DRAG 0x0000
extern WXDLLEXPORT_DATA(const wxChar*) wxSliderNameStr; extern WXDLLEXPORT_DATA(const wxChar*) wxSliderNameStr;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------