Updates to compile WX on OpenVMS

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

diff --git a/setup.h_vms b/setup.h_vms
index 74d8e0691af988f51ebb8d5c81de87a813f27f4f..19737e8fa0e5a9dda591468455625dcecd70946e 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -502,7 +502,11 @@ typedef pid_t GPid;
 
 #define wxUSE_NOTIFICATION_MESSAGE 1
 
 
 #define wxUSE_NOTIFICATION_MESSAGE 1
 

+#if defined (__WXMOTIF__)
+#define wxUSE_RICHTOOLTIP 0
+#else

 #define wxUSE_RICHTOOLTIP 1
 #define wxUSE_RICHTOOLTIP 1

+#endif

 
 #define wxUSE_SASH          1
 
 
 #define wxUSE_SASH          1
 

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index bf12ba2ec6ea35109ff22d9cce95bfc5464e2ca4..d0b978fbf9d89210c3d7cfc546aea901d3ff7f00 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)                             *
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *

-# Date : 27 September 2011                                                   *
+# Date : 4 November 2011                                                     *

 #                                                                            *
 #*****************************************************************************
 .first
 #                                                                            *
 #*****************************************************************************
 .first


@@ -223,7 +223,8 @@ OBJECTS3=listctrlcmn.obj,socketiohandler.obj,fdiodispatcher.obj,\
                statlinecmn.obj,radiobtncmn.obj,bmpbtncmn.obj,checklstcmn.obj,\
                statbmpcmn.obj,dirctrlcmn.obj,gridcmn.obj,odcombocmn.obj,\
                spinbtncmn.obj,scrolbarcmn.obj,colourdata.obj,fontdata.obj,\
                statlinecmn.obj,radiobtncmn.obj,bmpbtncmn.obj,checklstcmn.obj,\
                statbmpcmn.obj,dirctrlcmn.obj,gridcmn.obj,odcombocmn.obj,\
                spinbtncmn.obj,scrolbarcmn.obj,colourdata.obj,fontdata.obj,\

-               valnum.obj,numformatter.obj,markupparser.obj,affinematrix2d.obj
+               valnum.obj,numformatter.obj,markupparser.obj,\
+               affinematrix2d.obj,richtooltipcmn.obj

 
 OBJECTS_MOTIF=radiocmn.obj,combocmn.obj
 
 
 OBJECTS_MOTIF=radiocmn.obj,combocmn.obj
 


@@ -426,7 +427,8 @@ SOURCES = \
                statboxcmn.cpp,slidercmn.cpp,statlinecmn.cpp,radiobtncmn.cpp,\
                bmpbtncmn.cpp,checklstcmn.cpp,statbmpcmn.cpp,dirctrlcmn.cpp,\
                gridcmn.cpp,odcombocmn.cpp,spinbtncmn.cpp,scrolbarcmn.cpp,\
                statboxcmn.cpp,slidercmn.cpp,statlinecmn.cpp,radiobtncmn.cpp,\
                bmpbtncmn.cpp,checklstcmn.cpp,statbmpcmn.cpp,dirctrlcmn.cpp,\
                gridcmn.cpp,odcombocmn.cpp,spinbtncmn.cpp,scrolbarcmn.cpp,\

-               colourdata.cpp,fontdata.cpp affinematrix2d.cpp
+               colourdata.cpp,fontdata.cpp affinematrix2d.cpp\
+               richtooltipcmn.cpp

 
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
 
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)


@@ -708,3 +710,4 @@ valnum.obj : valnum.cpp
 numformatter.obj : numformatter.cpp
 markupparser.obj : markupparser.cpp
 affinematrix2d.obj : affinematrix2d.cpp
 numformatter.obj : numformatter.cpp
 markupparser.obj : markupparser.cpp
 affinematrix2d.obj : affinematrix2d.cpp

+richtooltipcmn.obj : richtooltipcmn.cpp

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 46fb6d86e4dc87684afc69c1cf81d560fb418a4d..a2c1fe0f3cc6a33d03cc6986363f5eaf447008c9 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)                             *
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *

-# Date : 30 September 2011                                                   *
+# Date : 4 November 2011                                                     *

 #                                                                            *
 #*****************************************************************************
 .first
 #                                                                            *
 #*****************************************************************************
 .first


@@ -70,7 +70,6 @@ OBJECTS = \
                msgdlgg.obj,\
                numdlgg.obj,\
                odcombo.obj,\
                msgdlgg.obj,\
                numdlgg.obj,\
                odcombo.obj,\

-               panelg.obj,\

                printps.obj,\
                prntdlgg.obj,\
                propdlg.obj,\
                printps.obj,\
                prntdlgg.obj,\
                propdlg.obj,\


@@ -95,7 +94,7 @@ OBJECTS = \
                grideditors.obj,vlbox.obj,vscroll.obj,stattextg.obj,\
                editlbox.obj,datavgen.obj,dbgrptg.obj,dragimgg.obj,\
                richmsgdlgg.obj,commandlinkbuttong.obj,spinctlg.obj,\
                grideditors.obj,vlbox.obj,vscroll.obj,stattextg.obj,\
                editlbox.obj,datavgen.obj,dbgrptg.obj,dragimgg.obj,\
                richmsgdlgg.obj,commandlinkbuttong.obj,spinctlg.obj,\

-               markuptext.obj,bannerwindow.obj,timectrl.obj
+               markuptext.obj,bannerwindow.obj,timectrl.obj,richtooltip.obj

 
 SOURCES = \
                aboutdlgg.cpp,\
 
 SOURCES = \
                aboutdlgg.cpp,\


@@ -132,7 +131,6 @@ SOURCES = \
                numdlgg.cpp,\
                odcombo.cpp,\
                paletteg.cpp,\
                numdlgg.cpp,\
                odcombo.cpp,\
                paletteg.cpp,\

-               panelg.cpp,\

                printps.cpp,\
                prntdlgg.cpp,\
                propdlg.cpp,\
                printps.cpp,\
                prntdlgg.cpp,\
                propdlg.cpp,\


@@ -168,7 +166,7 @@ SOURCES = \
                ,headerctrlg.cpp,grideditors.cpp,stattextg.cpp,editlbox.cpp,\
                datavgen.cpp,dbgrptg.cpp,dragimgg.cpp,richmsgdlgg.cpp,\
                commandlinkbuttong.cpp,spinctlg.cpp markuptext.cpp \
                ,headerctrlg.cpp,grideditors.cpp,stattextg.cpp,editlbox.cpp,\
                datavgen.cpp,dbgrptg.cpp,dragimgg.cpp,richmsgdlgg.cpp,\
                commandlinkbuttong.cpp,spinctlg.cpp markuptext.cpp \

-               bannerwindow.cpp,timectrl.cpp
+               bannerwindow.cpp timectrl.cpp richtooltip.cpp

 
 .ifdef __WXMOTIF__
 OBJECTS0=statusbr.obj,statline.obj,notebook.obj,spinctlg.obj,collpaneg.obj,\
 
 .ifdef __WXMOTIF__
 OBJECTS0=statusbr.obj,statline.obj,notebook.obj,spinctlg.obj,collpaneg.obj,\


@@ -251,7 +249,6 @@ notebook.obj : notebook.cpp
 numdlgg.obj : numdlgg.cpp
 odcombo.obj : odcombo.cpp
 paletteg.obj : paletteg.cpp
 numdlgg.obj : numdlgg.cpp
 odcombo.obj : odcombo.cpp
 paletteg.obj : paletteg.cpp

-panelg.obj : panelg.cpp

 printps.obj : printps.cpp
 prntdlgg.obj : prntdlgg.cpp
 progdlgg.obj : progdlgg.cpp
 printps.obj : printps.cpp
 prntdlgg.obj : prntdlgg.cpp
 progdlgg.obj : progdlgg.cpp


@@ -307,4 +304,5 @@ commandlinkbuttong.obj : commandlinkbuttong.cpp
 spinctlg.obj : spinctlg.cpp
 markuptext.obj : markuptext.cpp
 bannerwindow.obj : bannerwindow.cpp
 spinctlg.obj : spinctlg.cpp
 markuptext.obj : markuptext.cpp
 bannerwindow.obj : bannerwindow.cpp

-timectrl.obj : timectrl.cpp
\ No newline at end of file
+timectrl.obj : timectrl.cpp
+richtooltip.obj : richtooltip.cpp