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

setup.h_vms

@@ -860,7 +860,7 @@
 /*
  * MS Icons and Cursors format support
  */
-#define wxUSE_ICO_CUR 0
+#define wxUSE_ICO_CUR 1
 
 /*
  * Disable this if your compiler can't cope

src/generic/descrip.mms

@@ -46,7 +46,6 @@ OBJECTS = \
 		helpext.obj,\
 		helphtml.obj,\
 		helpwxht.obj,\
-		helpxlp.obj,\
 		imaglist.obj,\
 		laywin.obj,\
 		listctrl.obj,\
@@ -89,7 +88,6 @@ SOURCES = \
 		helpext.cpp,\
 		helphtml.cpp,\
 		helpwxht.cpp,\
-		helpxlp.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
-helpxlp.obj : helpxlp.cpp
 imaglist.obj : imaglist.cpp
 laywin.obj : laywin.cpp
 listctrl.obj : listctrl.cpp

src/gtk/app.cpp

@@ -11,6 +11,10 @@
     #pragma implementation "app.h"
 #endif
 
+#ifdef __VMS
+#include <vms_jackets.h>
+#endif
+
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
@@ -38,7 +42,11 @@
 #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>

src/gtk1/app.cpp

@@ -11,6 +11,10 @@
     #pragma implementation "app.h"
 #endif
 
+#ifdef __VMS
+#include <vms_jackets.h>
+#endif
+
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
@@ -38,7 +42,11 @@
 #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>

src/unix/threadpsx.cpp

@@ -825,7 +825,7 @@ void wxThreadInternal::Wait()
         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);
@@ -1203,7 +1203,7 @@ unsigned int wxThread::GetPriority() const
 
 wxThreadIdType wxThread::GetId() const
 {
-    return m_internal->GetId();
+    return (wxThreadIdType) m_internal->GetId();
 }
 
 // -----------------------------------------------------------------------------