updates for OpenVMS compile support

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

diff --git a/setup.h_vms b/setup.h_vms
index 7e67b3a9b206f419bd5070f1e9b466a98a2776ec..57569855f908e6f65582bdb746f67d40fe1f8d22 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -439,6 +439,11 @@ typedef pid_t GPid;
 
 #define wxUSE_VALIDATORS 1
 
+#ifdef __WXMSW__
+#define wxUSE_AUTOID_MANAGEMENT 0
+#else
+#define wxUSE_AUTOID_MANAGEMENT 0
+#endif
 
 #define wxUSE_COMMON_DIALOGS 1
 
@@ -1230,4 +1235,5 @@ typedef pid_t GPid;
 
 #undef HAVE_SYS_SELECT_H
 
+
 #endif /* __WX_SETUP_H__ */

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 22a6075b3cfa657a653da57e8de6b5173090d358..c00584c408257efd17f45f5f54e04b389f623d14 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 26 November 2007                                                    *
+# Date : 10 January 2008                                                     *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -207,7 +207,8 @@ OBJECTS2=tbarbase.obj,srchcmn.obj,\
                filepickercmn.obj,\
                fontpickercmn.obj,\
                pickerbase.obj,\
-               listctrlcmn.obj
+               listctrlcmn.obj,gsocketiohandler.obj,fdiodispatcher.obj,\
+               selectdispatcher.obj,overlaycmn.obj,windowid.obj
 
 OBJECTS_MOTIF=radiocmn.obj,combocmn.obj
 
@@ -217,8 +218,6 @@ OBJECTS_X11=accesscmn.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\
        regex.obj,taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj,\
        combocmn.obj
 
-OBJECTS_X11_2=gsocketiohandler.obj,fdiodispatcher.obj,selectdispatcher.obj
-
 
 OBJECTS_GTK2=fontutilcmn.obj,cairo.obj
 
@@ -326,6 +325,7 @@ SOURCES = \
                mstream.cpp,\
                nbkbase.cpp,\
                object.cpp,\
+               overlaycmn.cpp,\
                paper.cpp,\
                platinfo.cpp,\
                popupcmn.cpp,\
@@ -432,17 +432,22 @@ all : $(SOURCES)
 .else
 .ifdef __WXX11__
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11)
-       $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11_2)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS1)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS2)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS_X11)
-       library [--.lib]libwx_x11_univ.olb $(OBJECTS_X11_2)
 .endif
 .endif
 .endif
 .endif
 
+$(OBJECTS) : [--.include.wx]setup.h
+$(OBJECTS1) : [--.include.wx]setup.h
+$(OBJECTS2) : [--.include.wx]setup.h
+$(OBJECTS_X11) : [--.include.wx]setup.h
+$(OBJECTS_GTK2) : [--.include.wx]setup.h
+$(OBJECTS_MOTIF) : [--.include.wx]setup.h
+
 accelcmn.obj : accelcmn.cpp
 anidecod.obj : anidecod.cpp
 animatecmn.obj : animatecmn.cpp
@@ -623,3 +628,5 @@ srchcmn.obj : srchcmn.cpp
 textentrycmn.obj : textentrycmn.cpp
 filectrlcmn.obj : filectrlcmn.cpp
 cairo.obj : cairo.cpp
+overlaycmn.obj : overlaycmn.cpp
+windowid.obj : windowid.cpp

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index c5b445355783b19efcc9950ece9cec07b873dbb9..c08ec94b9ad3f95db6ef1db51e37fe66a92d7c56 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 : 20 December 2007                                                    *
+# Date : 3 January 2008                                                      *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -164,8 +164,7 @@ SOURCES = \
 
 .ifdef __WXMOTIF__
 OBJECTS0=statusbr.obj,statline.obj,notebook.obj,spinctlg.obj,collpaneg.obj,\
-       combog.obj,animateg.obj,colrdlgg.obj,clrpickerg.obj,fontpickerg.obj,\
-       paletteg.obj
+       combog.obj,animateg.obj,colrdlgg.obj,clrpickerg.obj,fontpickerg.obj
 .else
 .ifdef __WXX11__
 OBJECTS0=accel.obj,filedlgg.obj,dragimgg.obj,fdrepdlg.obj,htmllbox.obj,\

diff --git a/src/univ/descrip.mms b/src/univ/descrip.mms
index 0f84915c9a7ab32b31a2741f5b5e9583fa076cfa..b79d610eee796f11ee826eb1b2198ce21ea264e8 100644 (file)
--- a/src/univ/descrip.mms
+++ b/src/univ/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 22 September 2006                                                   *
+# Date : 4 January 2008                                                      *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -106,6 +106,8 @@ all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS)
 
+$(OBJECTS) : [--.include.wx]setup.h
+
 bmpbuttn.obj : bmpbuttn.cpp
 button.obj : button.cpp
 checkbox.obj : checkbox.cpp
@@ -141,7 +143,7 @@ winuniv.obj : winuniv.cpp
 combobox.obj : combobox.cpp
 ctrlrend.obj : ctrlrend.cpp
 gtk.obj : [.themes]gtk.cpp
-       cxx $(CXXFLAGS)$(CXX_DEFINE) [.themes]gtk.cpp
+       cxx $(CXXFLAGS)$(CXX_DEFINE)/object=gtk.obj [.themes]gtk.cpp
 metal.obj : [.themes]metal.cpp
        cxx $(CXXFLAGS)$(CXX_DEFINE) [.themes]metal.cpp
 radiobox.obj : radiobox.cpp

diff --git a/src/x11/descrip.mms b/src/x11/descrip.mms
index 0d641756d12fce6ac0edfc5bdea9105d2fdf1dd3..b0081a1efc3e24853aa7a98737abb14aa4011802 100644 (file)
--- a/src/x11/descrip.mms
+++ b/src/x11/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 3 January 2007                                                      *
+# Date : 3 January 2008                                                      *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -34,6 +34,7 @@ OBJECTS = \
                bitmap.obj,\
                brush.obj,\
                glcanvas.obj,\
+               palette.obj,\
                pen.obj,\
                region.obj,\
                utilsx.obj
@@ -46,7 +47,6 @@ OBJECTS_X11=app.obj,dc.obj,\
                font.obj,\
                minifram.obj,\
                nanox.obj,\
-               palette.obj,\
                popupwin.obj,\
                reparent.obj,\
                settings.obj,\
@@ -101,6 +101,9 @@ all : $(SOURCES)
 .endif
 .endif
 
+$(OBJECTS) : [--.include.wx]setup.h
+$(OBJECTS_X11) : [--.include.wx]setup.h
+
 bitmap.obj : bitmap.cpp
 brush.obj : brush.cpp
 glcanvas.obj : glcanvas.cpp