moved wxGA_XXX styles to gauge.h from defs.h; set wxGA_PROGRESSBAR as 0 (it's not...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index f04c766d6d3c85a3d5e3376300185e6caddce2bf..790fd47e39af28e5f56ec519f59a4eecc27556fd 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1266,15 +1266,6 @@ enum wxBorder
 #define wxRB_GROUP          0x0004
 #define wxRB_SINGLE         0x0008
 
 #define wxRB_GROUP          0x0004
 #define wxRB_SINGLE         0x0008
 

-/*
- * wxGauge flags
- */
-#define wxGA_HORIZONTAL      wxHORIZONTAL
-#define wxGA_VERTICAL        wxVERTICAL
-#define wxGA_PROGRESSBAR     0x0010
-// Windows only
-#define wxGA_SMOOTH          0x0020
-

 /*
  * wxSlider flags
  */
 /*
  * wxSlider flags
  */

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 17fbc5206e11dc2ae0745f20f9b73d6dc2b2cdc2..4add88a2f3c2cc6257f99066ac58718f72fa26af 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -22,6 +22,20 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

+// ----------------------------------------------------------------------------
+// wxGauge style flags
+// ----------------------------------------------------------------------------
+
+#define wxGA_HORIZONTAL      wxHORIZONTAL
+#define wxGA_VERTICAL        wxVERTICAL
+
+// Win32 only, is default (and only) on some other platforms
+#define wxGA_SMOOTH          0x0020
+
+// obsolete style
+#define wxGA_PROGRESSBAR     0
+
+

 WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
 
 // ----------------------------------------------------------------------------
 WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
 
 // ----------------------------------------------------------------------------