Committing in .

 wxMOTIF updates for OpenVMS

 Modified Files:
 	wxWindows/setup.h_vms wxWindows/src/generic/descrip.mms
 	wxWindows/src/motif/descrip.mms
 	wxWindows/src/motif/glcanvas.cpp
 ----------------------------------------------------------------------

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

diff --git a/setup.h_vms b/setup.h_vms
index 4def44b356ae2943c383bd7ac6690b73049fb73e..17ef3a44aebf6d83dd195bbbc60241754312cd57 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -213,7 +213,11 @@
 /*
  * Use wxPopupWindow (useful in wxUniv only for now)
  */
 /*
  * Use wxPopupWindow (useful in wxUniv only for now)
  */

+#ifdef __WXMOTIF__
+#define wxUSE_POPUPWIN 0
+#else

 #define wxUSE_POPUPWIN 1
 #define wxUSE_POPUPWIN 1

+#endif

 
 /*
    Use wxTipWindow
 
 /*
    Use wxTipWindow


@@ -666,7 +670,11 @@
 /*
  * Use tooltips
  */
 /*
  * Use tooltips
  */

+#ifdef __WXMOTIF__
+#define wxUSE_TOOLTIPS 0
+#else

 #define wxUSE_TOOLTIPS 1
 #define wxUSE_TOOLTIPS 1

+#endif

 /*
  * Use dnd
  */
 /*
  * Use dnd
  */

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 669c314783870dce1858874f0a588cd53fdae198..fd2888ca256d48152ecf3bc164e7bed2d9fae1b3 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -31,7 +31,6 @@ CC_DEFINE =
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \

-               accel.obj,\

                busyinfo.obj,\
                calctrl.obj,\
                caret.obj,\
                busyinfo.obj,\
                calctrl.obj,\
                caret.obj,\


@@ -119,10 +118,9 @@ SOURCES = \
                wizard.cpp
 
 .ifdef __WXMOTIF__
                wizard.cpp
 
 .ifdef __WXMOTIF__

-OBJECTS0=,statline.obj,\
-               notebook.obj
+OBJECTS0=,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj

 .else
 .else

-OBJECTS0=,filedlgg.obj,paletteg.obj
+OBJECTS0=,accel.obj,filedlgg.obj,paletteg.obj

 .endif
 
 all : $(SOURCES)
 .endif
 
 all : $(SOURCES)


@@ -168,6 +166,8 @@ progdlgg.obj : progdlgg.cpp
 prop.obj : prop.cpp
 propform.obj : propform.cpp
 proplist.obj : proplist.cpp
 prop.obj : prop.cpp
 propform.obj : propform.cpp
 proplist.obj : proplist.cpp

+scrlwing.obj : scrlwing.cpp
+spinctlg.obj : spinctlg.cpp

 sashwin.obj : sashwin.cpp
 splitter.obj : splitter.cpp
 statline.obj : statline.cpp
 sashwin.obj : sashwin.cpp
 splitter.obj : splitter.cpp
 statline.obj : statline.cpp

diff --git a/src/motif/descrip.mms b/src/motif/descrip.mms
index b13eb7891338d707f7c4d90e4b269491d1d872db..725abeff548007775fd3c0b7580ee87ea537fdf4 100644 (file)
--- a/src/motif/descrip.mms
+++ b/src/motif/descrip.mms
@@ -51,6 +51,7 @@ OBJECTS = \
                frame.obj,\
                gauge.obj,\
                gdiobj.obj,\
                frame.obj,\
                gauge.obj,\
                gdiobj.obj,\

+               glcanvas.obj,\

                gsockmot.obj,\
                icon.obj,\
                listbox.obj,\
                gsockmot.obj,\
                icon.obj,\
                listbox.obj,\


@@ -105,6 +106,7 @@ SOURCES = \
                frame.cpp,\
                gauge.cpp,\
                gdiobj.cpp,\
                frame.cpp,\
                gauge.cpp,\
                gdiobj.cpp,\

+               glcanvas.cpp,\

                gsockmot.c,\
                icon.cpp,\
                listbox.cpp,\
                gsockmot.c,\
                icon.cpp,\
                listbox.cpp,\


@@ -168,6 +170,7 @@ font.obj : font.cpp
 frame.obj : frame.cpp
 gauge.obj : gauge.cpp
 gdiobj.obj : gdiobj.cpp
 frame.obj : frame.cpp
 gauge.obj : gauge.cpp
 gdiobj.obj : gdiobj.cpp

+glcanvas.obj : glcanvas.cpp

 gsockmot.obj : gsockmot.c
 icon.obj : icon.cpp
 listbox.obj : listbox.cpp
 gsockmot.obj : gsockmot.c
 icon.obj : icon.cpp
 listbox.obj : listbox.cpp

diff --git a/src/motif/glcanvas.cpp b/src/motif/glcanvas.cpp
index 046c5d0c6c92cfd76cd71eeaa8c306c74f33d5b6..776eb9746c8aea01bb2df8af4abb4a54a9419441 100644 (file)
--- a/src/motif/glcanvas.cpp
+++ b/src/motif/glcanvas.cpp
@@ -22,7 +22,13 @@
 #include "wx/utils.h"
 #include "wx/app.h"
 
 #include "wx/utils.h"
 #include "wx/app.h"
 

+#ifdef __VMS
+# pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <Xm/Xm.h>

+#ifdef __VMS
+# pragma message enable nosimpint
+#endif

 #include "wx/motif/private.h"
 
 #ifdef OLD_MESA
 #include "wx/motif/private.h"
 
 #ifdef OLD_MESA