allow customization of individual grid lines appearance (patch 1496015)

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

diff --git a/include/wx/db.h b/include/wx/db.h
index 5d7d67c220d0bfc794ce8c4a00b1a1c9b8d216d3..68c723b5eb68d931bc159575f4a835c4700ec233 100644 (file)
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -80,11 +80,18 @@
           #endif
         #endif
     #else
+      #if defined( __WXMOTIF__ ) && defined( __VMS )
+       // solves a type definition mismatch between IODBC and MOTIF on OpenVMS
+      #define BOOL int
+      #endif
         #include <sql.h>
         #include <sqlext.h>
         //#if wxUSE_UNICODE
         //    #include <sqlucode.h>
         //#endif
+      #if defined( __WXMOTIF__ ) && defined( __VMS )
+      #undef BOOL
+      #endif
     #endif
     }
 #endif

diff --git a/setup.h_vms b/setup.h_vms
index 07bde38e74f1c9ac765cdb9085f3f9a86153da07..6b62637966410abb47c9d3f3de8b55ed99cdb821 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -322,6 +322,7 @@ typedef pid_t GPid;
 
 #define wxUSE_TIPWINDOW    1
 
+#define wxUSE_ANIMATIONCTRL 1
 #define wxUSE_BUTTON       1
 #define wxUSE_BMPBUTTON    1
 #define wxUSE_CALENDARCTRL 1
@@ -444,6 +445,7 @@ typedef pid_t GPid;
 
 #define wxUSE_WIZARDDLG 1
 
+#define wxUSE_ABOUTDLG 1
 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0
@@ -485,6 +487,8 @@ typedef pid_t GPid;
 
 #define wxUSE_HELP        1
 
+#define wxUSE_MS_HTML_HELP 0
+
 #define wxUSE_WXHTML_HELP 1
 
 #define wxUSE_RESOURCES   1

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 9618cb9ee7182bc53270afbb1b16334d4b692630..7eef868b440fdb9a9f72974236842dd6e4d6a7bb 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 19 September 2006                                                   *
+# Date : 9 October 2006                                                      *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -90,7 +90,8 @@ OBJECTS = \
                treectlg.obj,\
                wizard.obj,\
                hyperlink.obj,\
-               filepickerg.obj
+               filepickerg.obj,\
+               bmpcboxg.obj
 
 SOURCES = \
                accel.cpp,\
@@ -155,7 +156,7 @@ SOURCES = \
                hyperlink.cpp,\
                filepickerg.cpp,\
                vscroll.cpp,\
-               icon.cpp
+               icon.cpp,bmpcboxg.cpp
 
 .ifdef __WXMOTIF__
 OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,spinctlg.obj
@@ -255,3 +256,4 @@ combog.obj : combog.cpp
 fontpickerg.obj : fontpickerg.cpp
 hyperlink.obj : hyperlink.cpp
 filepickerg.obj : filepickerg.cpp
+bmpcboxg.obj : bmpcboxg.cpp

diff --git a/src/xrc/descrip.mms b/src/xrc/descrip.mms
index 4b64c8072cd6470b008ecad88df49cdfe1f236b2..ec8195a21e5c311ad4ba2ea23946e7e230fb0c07 100755 (executable)
--- a/src/xrc/descrip.mms
+++ b/src/xrc/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 19 September 2006                                                   *
+# Date : 9 October  2006                                                     *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -53,7 +53,7 @@ OBJECTS=xh_bmp.obj,xh_bmpbt.obj,xh_bttn.obj,xh_cald.obj,xh_chckb.obj,\
        xh_unkwn.obj,xh_wizrd.obj,xmlres.obj,xmlrsall.obj,xh_listbk.obj,\
        xh_choicbk.obj,xh_dirpicker.obj,xh_hyperlink.obj,xh_filepicker.obj,\
        xh_fontpicker.obj,xh_clrpicker.obj,xh_odcombo.obj,xh_mdi.obj,\
-       xh_grid.obj,xh_datectrl.obj,xh_treebk.obj
+       xh_grid.obj,xh_datectrl.obj,xh_treebk.obj,xh_bmpcbox.obj
 
 SOURCES =xh_bmp.cpp,xh_bmpbt.cpp,xh_bttn.cpp,xh_cald.cpp,xh_chckb.cpp,\
        xh_chckl.cpp,xh_choic.cpp,xh_combo.cpp,xh_dlg.cpp,xh_frame.cpp,\
@@ -65,7 +65,7 @@ SOURCES =xh_bmp.cpp,xh_bmpbt.cpp,xh_bttn.cpp,xh_cald.cpp,xh_chckb.cpp,\
        xh_unkwn.cpp,xh_wizrd.cpp,xmlres.cpp,xmlrsall.cpp,xh_listbk.cpp,\
        xh_choicbk.cpp,xh_dirpicker.cpp,xh_hyperlink.cpp,xh_filepicker.cpp,\
        xh_fontpicker.cpp,xh_clrpicker.cpp,xh_odcombo.cpp,xh_mdi.cpp,\
-       xh_grid.cpp,xh_datectrl.cpp,xh_treebk.cpp
+       xh_grid.cpp,xh_datectrl.cpp,xh_treebk.cpp,xh_bmpcbox.cpp
   
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -136,3 +136,4 @@ xh_mdi.obj : xh_mdi.cpp
 xh_grid.obj : xh_grid.cpp
 xh_datectrl.obj : xh_datectrl.cpp
 xh_treebk.obj : xh_treebk.cpp
+xh_bmpcbox.obj : xh_bmpcbox.cpp