Committing in .

 OpenVMS changes

 Modified Files:
	wxWidgets/descrip.mms wxWidgets/setup.h_vms
 	wxWidgets/src/common/descrip.mms
 	wxWidgets/src/unix/descrip.mms
 ----------------------------------------------------------------------

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

diff --git a/descrip.mms b/descrip.mms
index d9237d52783ad2ff49fad05c7baf6f6d4af70f96..324911e9c8feaeb9e5ddeeabb1a69eefe0fce97e 100644 (file)
--- a/descrip.mms
+++ b/descrip.mms
@@ -79,7 +79,7 @@ gtk : [.include.wx]setup.h
        set default [-.minimal]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [-.richedit]
-       $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
+#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [--]
 
 x11 : [.include.wx]setup.h

diff --git a/setup.h_vms b/setup.h_vms
index 4c91ef0653b3450adcf709efbc3eb9758fd07c6c..e1e90daf61744f36afd11b4d9711f638be11bc53 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -54,7 +54,7 @@
 #undef size_t
 
 /* Define if ssize_t type is available.  */
-#undef HAVE_SSIZE_T
+#define HAVE_SSIZE_T 1
 
 /* Define if you have the ANSI C header files.  */
 #define STDC_HEADERS
@@ -680,7 +680,11 @@
 /*
  * Use wxMediaCtrl class
  */
-#define wxUSE_MEDIACTRL 0
+#define wxUSE_MEDIACTRL 1
+/*
+ * Use DirectShow
+ */
+#define wxUSE_DIRECTSHOW 1
 /*
  * Use config system
  */

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index ac7d287049e38c15b6643b1b4deb85c3bc976376..5ac8039ba8bce367b49c0ebfc076d7f6c4270f0d 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -142,6 +142,7 @@ OBJECTS1=fs_inet.obj,\
                socket.obj,\
                settcmn.obj,\
                statbar.obj,\
+               stdpbase.obj,\
                stockitem.obj,\
                stopwatch.obj,\
                strconv.obj,\
@@ -157,7 +158,6 @@ OBJECTS1=fs_inet.obj,\
                toplvcmn.obj,\
                treebase.obj,\
                txtstrm.obj,\
-               unzip.obj,\
                url.obj
 
 OBJECTS2=utilscmn.obj,\
@@ -282,6 +282,7 @@ SOURCES = \
                socket.cpp,\
                settcmn.cpp,\
                statbar.cpp,\
+               stdpbase.cpp,\
                stockitem.cpp,\
                stopwatch.cpp,\
                strconv.cpp,\
@@ -297,7 +298,6 @@ SOURCES = \
                toplvcmn.cpp,\
                treebase.cpp,\
                txtstrm.cpp,\
-               unzip.c,\
                url.cpp,\
                utilscmn.cpp,\
                valgen.cpp,\
@@ -455,6 +455,7 @@ sizer.obj : sizer.cpp
 socket.obj : socket.cpp
 settcmn.obj : settcmn.cpp
 statbar.obj : statbar.cpp
+stdpbase.obj : stdpbase.cpp
 stockitem.obj : stockitem.cpp
 stopwatch.obj : stopwatch.cpp
 strconv.obj : strconv.cpp
@@ -470,7 +471,6 @@ tokenzr.obj : tokenzr.cpp
 toplvcmn.obj : toplvcmn.cpp
 treebase.obj : treebase.cpp
 txtstrm.obj : txtstrm.cpp
-unzip.obj : unzip.c
 url.obj : url.cpp
 utilscmn.obj : utilscmn.cpp
 valgen.obj : valgen.cpp

diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms
index b02e9272fc40166491ebfb1a3d451274eccfb6be..abeea67e0a7d4d49bfd2ce075aa7f2faa9e3ded7 100644 (file)
--- a/src/unix/descrip.mms
+++ b/src/unix/descrip.mms
@@ -51,6 +51,7 @@ OBJECTS =       baseunix.obj,\
                snglinst.obj,\
                sound.obj,\
                sound_sdl.obj,\
+               stdpaths.obj,\
                taskbarx11.obj
 
 SOURCES =       baseunix.cpp,\
@@ -67,6 +68,7 @@ SOURCES =       baseunix.cpp,\
                snglinst.cpp,\
                sound.cpp,\
                sound_sdl.cpp,\
+               stdpaths.cpp,\
                taskbarx11.cpp
 
 all : $(SOURCES)
@@ -98,4 +100,5 @@ joystick.obj : joystick.cpp
 snglinst.obj : snglinst.cpp
 sound.obj : sound.cpp
 sound_sdl.obj : sound_sdl.cpp
+stdpaths.obj : stdpaths.cpp
 taskbarx11.obj : taskbarx11.cpp