OpenVMS changes

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

diff --git a/descrip.mms b/descrip.mms
index 30f2d0c1f3d67cfbe5a4d3090ee234a1b933d1a8..0539ab9e1931315cc996f27d981f99e15e91d817 100644 (file)
--- a/descrip.mms
+++ b/descrip.mms
@@ -236,7 +236,6 @@ motif : [.include.wx]setup.h
        library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
        set default [-.aui]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
-       library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
        set default [-.motif]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
        library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj

diff --git a/setup.h_vms b/setup.h_vms
index 3986688c0098b845d8fc0d3bfc280676eb43b60e..02aa617197428763d64e08c97296eef2e3717e58 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -3,7 +3,7 @@
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *
- * Date : 17 April 2007                                                      *
+ * Date : 16 May 2007                                                        *
  *                                                                           *
  *****************************************************************************/
 
@@ -343,6 +343,7 @@ typedef pid_t GPid;
 #define wxUSE_DATAVIEWCTRL   1
 #define wxUSE_DATEPICKCTRL 1
 #define wxUSE_DIRPICKERCTRL 1
+#define wxUSE_EDITABLELISTBOX 1
 #define wxUSE_FILEPICKERCTRL 1
 #define wxUSE_FONTPICKERCTRL 1
 #define wxUSE_GAUGE        1
@@ -591,6 +592,8 @@ typedef pid_t GPid;
 
 #define wxUSE_UNICODE_UTF8 0
 
+#define wxUSE_UTF8_LOCALE_ONLY 0
+
 #define wxUSE_DC_CACHEING 1
 
 #define wxUSE_GADGETS 1
@@ -1236,6 +1239,9 @@ typedef pid_t GPid;
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 
+/* Define if you have the <sys/epoll.h> header file.  */
+#undef HAVE_SYS_EPOLL_H
+
 /* Define if fdopen is available.  */
 #define HAVE_FDOPEN 1
 

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index de3d44b9a57d1b1dec06c838101e68b0feb5f901..337ddb4eb0309b407c64a98a91c7aeee8c6c8fa9 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 : 19 April 2007                                                       *
+# Date : 24 April 2007                                                       *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -182,6 +182,7 @@ OBJECTS2=tbarbase.obj,\
                textcmn.obj,\
                textfile.obj,\
                timercmn.obj,\
+               timerimpl.obj,\
                tokenzr.obj,\
                toplvcmn.obj,\
                treebase.obj,\
@@ -354,6 +355,7 @@ SOURCES = \
                textcmn.cpp,\
                textfile.cpp,\
                timercmn.cpp,\
+               timerimpl.cpp,\
                tokenzr.cpp,\
                toplvcmn.cpp,\
                treebase.cpp,\
@@ -566,6 +568,7 @@ textbuf.obj : textbuf.cpp
 textcmn.obj : textcmn.cpp
 textfile.obj : textfile.cpp
 timercmn.obj : timercmn.cpp
+timerimpl.obj : timerimpl.cpp
 tokenzr.obj : tokenzr.cpp
 toplvcmn.obj : toplvcmn.cpp
 treebase.obj : treebase.cpp

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index 8e8b604bdac9b34cf1b541570ee05df8e0212ece..0626cfa3773104b1fda9f6c912f5c2224b8665ea 100644 (file)
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -215,3 +215,14 @@ void wxGUIAppTraits::SetLocale()
 }
 #endif
 
+wxString
+wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
+                                          wxArrayString& desc) const
+{
+    wxString usage;
+
+    wxUnusedVar(names);
+    wxUnusedVar(desc);
+
+    return usage;
+}

diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms
index 5aabe90bbe14307f336bdc2e181190360059dc2a..984e899de985491bd6a901cdb2aff1da6c99b5d6 100644 (file)
--- a/src/unix/descrip.mms
+++ b/src/unix/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 13 February 2006                                                    *
+# Date : 24 April 2007                                                       *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -60,7 +60,8 @@ OBJECTS =       baseunix.obj,\
                sound.obj,\
                sound_sdl.obj,\
                stdpaths.obj,\
-               taskbarx11.obj
+               taskbarx11.obj,\
+               timerunx.obj
 
 SOURCES =       baseunix.cpp,\
                dialup.cpp,\
@@ -79,7 +80,8 @@ SOURCES =       baseunix.cpp,\
                sound.cpp,\
                sound_sdl.cpp,\
                stdpaths.cpp,\
-               taskbarx11.cpp
+               taskbarx11.cpp,\
+               timerunx.cpp
 
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -118,3 +120,4 @@ sound_sdl.obj : sound_sdl.cpp
 stdpaths.obj : stdpaths.cpp
 taskbarx11.obj : taskbarx11.cpp
 displayx11.obj : displayx11.cpp
+timerunx.obj : timerunx.cpp

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index 2af78decca5f1d4caf8047979cdb6e2841cfb3e4..ba6ebacd0e477960cc7b83db4d9e90107f130963 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -1359,7 +1359,7 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
     Pixmap mask = 0;
 
     int ErrorStatus = XpmReadFileToPixmap( xdisplay, xroot,
-                                           (char*) name.c_str(),
+                                           (char*) ((const char*) name.c_str()),
                                            &pixmap, &mask, &xpmAttr);
 
     if (ErrorStatus == XpmSuccess)