Committing in .

 setup.h_vms : synching with setup.h.in
 gtk1/gauge.h : gtk1 has no native wxGauge::Pulse so it has to inherit it from
                wxGaugeBase (just like i.e. wxMOTIF)

 Modified Files:
 	wxWidgets/setup.h_vms wxWidgets/include/wx/gtk1/gauge.h

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

diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h
index 0f41210a76ca7ca7335586a275fd3598047e0291..8e656daf2b7a1fd704ea8797ca906c6b650a9061 100644 (file)
--- a/include/wx/gtk1/gauge.h
+++ b/include/wx/gtk1/gauge.h
@@ -34,7 +34,7 @@ extern WXDLLIMPEXP_CORE const wxChar wxGaugeNameStr[];
 // wxGaugeBox
 //-----------------------------------------------------------------------------
 
 // wxGaugeBox
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxGauge: public wxControl
+class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase

 {
 public:
     wxGauge() { Init(); }
 {
 public:
     wxGauge() { Init(); }

diff --git a/setup.h_vms b/setup.h_vms
index c93c220075e85ea1fe619e19bfd8a89b83575835..fe2a828160c6ffd18f4c426aeb33408ee53c8ed7 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -3,7 +3,7 @@
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *

- * Date : 16 August 2006                                                     *
+ * Date : 28 September 2006                                                     *

  *                                                                           *
  *****************************************************************************/
 
  *                                                                           *
  *****************************************************************************/
 


@@ -286,6 +286,8 @@ typedef pid_t GPid;
 
 #define wxUSE_URL_NATIVE 0
 
 
 #define wxUSE_URL_NATIVE 0
 

+#define wxUSE_VARIANT 1
+

 #define wxUSE_REGEX       0
 
 #define wxUSE_SYSTEM_OPTIONS 1
 #define wxUSE_REGEX       0
 
 #define wxUSE_SYSTEM_OPTIONS 1


@@ -733,9 +735,10 @@ typedef pid_t GPid;
  */
 #define wxUSE_X_RESOURCES 1
 /*
  */
 #define wxUSE_X_RESOURCES 1
 /*

- * Use OLE (MSW only)
+ * Use OLE and OLE Automation (MSW only)

  */
 #define wxUSE_OLE 0
  */
 #define wxUSE_OLE 0

+#define wxUSE_OLE_AUTOMATION 0

 
 /* for compatibility */
 #define wxUSE_WX_RESOURCES wxUSE_RESOURCES
 
 /* for compatibility */
 #define wxUSE_WX_RESOURCES wxUSE_RESOURCES