Committing in .

 Various patches to get the current CVS compile on OpenVMS

 Modified Files:
 	wxWindows/setup.h_vms wxWindows/src/generic/descrip.mms
 	wxWindows/src/gtk/app.cpp wxWindows/src/unix/threadpsx.cpp
 ----------------------------------------------------------------------

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

diff --git a/setup.h_vms b/setup.h_vms
index b61224fb919e6774c606ed1b53c701dc5d1fe065..5ef08f67418b3eb7f44e6a150633ab00afc2a57c 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -860,7 +860,7 @@
 /*
  * MS Icons and Cursors format support
  */
 /*
  * MS Icons and Cursors format support
  */

-#define wxUSE_ICO_CUR 0
+#define wxUSE_ICO_CUR 1

 
 /*
  * Disable this if your compiler can't cope
 
 /*
  * Disable this if your compiler can't cope

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index fd2888ca256d48152ecf3bc164e7bed2d9fae1b3..00474ef5795cd056385bd5d6be9e1e8976f13b3f 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -46,7 +46,6 @@ OBJECTS = \
                helpext.obj,\
                helphtml.obj,\
                helpwxht.obj,\
                helpext.obj,\
                helphtml.obj,\
                helpwxht.obj,\

-               helpxlp.obj,\

                imaglist.obj,\
                laywin.obj,\
                listctrl.obj,\
                imaglist.obj,\
                laywin.obj,\
                listctrl.obj,\


@@ -89,7 +88,6 @@ SOURCES = \
                helpext.cpp,\
                helphtml.cpp,\
                helpwxht.cpp,\
                helpext.cpp,\
                helphtml.cpp,\
                helpwxht.cpp,\

-               helpxlp.cpp,\

                imaglist.cpp,\
                laywin.cpp,\
                listctrl.cpp,\
                imaglist.cpp,\
                laywin.cpp,\
                listctrl.cpp,\


@@ -150,7 +148,6 @@ gridsel.obj : gridsel.cpp
 helpext.obj : helpext.cpp
 helphtml.obj : helphtml.cpp
 helpwxht.obj : helpwxht.cpp
 helpext.obj : helpext.cpp
 helphtml.obj : helphtml.cpp
 helpwxht.obj : helpwxht.cpp

-helpxlp.obj : helpxlp.cpp

 imaglist.obj : imaglist.cpp
 laywin.obj : laywin.cpp
 listctrl.obj : listctrl.cpp
 imaglist.obj : imaglist.cpp
 laywin.obj : laywin.cpp
 listctrl.obj : listctrl.cpp

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 283e3330643a3e503d4dece488c49c9ceab4952c..eb7f991c51d0fa57593a7e3c9b595ffe21a796be 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -11,6 +11,10 @@
     #pragma implementation "app.h"
 #endif
 
     #pragma implementation "app.h"
 #endif
 

+#ifdef __VMS
+#include <vms_jackets.h>
+#endif
+

 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"


@@ -38,7 +42,11 @@
 #endif
 
 #include <unistd.h>
 #endif
 
 #include <unistd.h>

-#include <sys/poll.h>
+#ifdef __VMS
+# include <poll.h>
+#else
+# include <sys/poll.h>
+#endif

 #include "wx/gtk/win_gtk.h"
 
 #include <gtk/gtk.h>
 #include "wx/gtk/win_gtk.h"
 
 #include <gtk/gtk.h>

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 283e3330643a3e503d4dece488c49c9ceab4952c..eb7f991c51d0fa57593a7e3c9b595ffe21a796be 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -11,6 +11,10 @@
     #pragma implementation "app.h"
 #endif
 
     #pragma implementation "app.h"
 #endif
 

+#ifdef __VMS
+#include <vms_jackets.h>
+#endif
+

 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"


@@ -38,7 +42,11 @@
 #endif
 
 #include <unistd.h>
 #endif
 
 #include <unistd.h>

-#include <sys/poll.h>
+#ifdef __VMS
+# include <poll.h>
+#else
+# include <sys/poll.h>
+#endif

 #include "wx/gtk/win_gtk.h"
 
 #include <gtk/gtk.h>
 #include "wx/gtk/win_gtk.h"
 
 #include <gtk/gtk.h>

diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index 960683208ee54c907a1bef4db05dc478b8a7a1ba..5e8ba134236f1b5b4b89bf2642aff45488963a77 100644 (file)
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -825,7 +825,7 @@ void wxThreadInternal::Wait()
         wxMutexGuiLeave();
 
     bool isDetached = m_isDetached;
         wxMutexGuiLeave();
 
     bool isDetached = m_isDetached;

-    wxThreadIdType id = GetId();
+    wxThreadIdType id = (wxThreadIdType) GetId();

 
     wxLogTrace(TRACE_THREADS,
                _T("Starting to wait for thread %ld to exit."), id);
 
     wxLogTrace(TRACE_THREADS,
                _T("Starting to wait for thread %ld to exit."), id);


@@ -1203,7 +1203,7 @@ unsigned int wxThread::GetPriority() const
 
 wxThreadIdType wxThread::GetId() const
 {
 
 wxThreadIdType wxThread::GetId() const
 {

-    return m_internal->GetId();
+    return (wxThreadIdType) m_internal->GetId();

 }
 
 // -----------------------------------------------------------------------------
 }
 
 // -----------------------------------------------------------------------------