Committing in .

 Update of OpenVMS compile support

 Modified Files:
 	wxWidgets/setup.h_vms wxWidgets/src/common/descrip.mms
 	wxWidgets/src/generic/descrip.mms
 	wxWidgets/src/gtk/descrip.mms wxWidgets/src/unix/descrip.mms
 	wxWidgets/src/unix/displayx11.cpp
 ----------------------------------------------------------------------

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

diff --git a/setup.h_vms b/setup.h_vms
index 7a5607d9e7dc8fd011dc9fc8ee9a6bfcf7f8cb2f..a967ed7470ee2f32e673bfd0b1e169693ccfc0ae 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 : 9 February 2006                                                    *
+ * Date : 15 February 2006                                                    *
  *                                                                           *
  *****************************************************************************/
 
@@ -543,6 +543,8 @@ typedef pid_t GPid;
 #define wxUSE_RICHEDIT2 0
 #endif
 
+#define wxUSE_INKEDIT 1
+
 #define wxUSE_UNICODE_MSLU 0
 
 #define wxUSE_DC_CACHEING 1

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 2efbfebef78612128a63f9180286f76283dbcf0a..09e28969fca29bc696a1d2b2317ae4da241ab144 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -79,6 +79,7 @@ OBJECTS = \
                dobjcmn.obj,\
                docmdi.obj,\
                docview.obj,\
+               dpycmn.obj,\
                dynarray.obj,\
                dynlib.obj,\
                encconv.obj,\
@@ -221,6 +222,7 @@ SOURCES = \
                dobjcmn.cpp,\
                docmdi.cpp,\
                docview.cpp,\
+               dpycmn.cpp,\
                dynarray.cpp,\
                dynlib.cpp,\
                encconv.cpp,\
@@ -523,3 +525,4 @@ xti.obj : xti.cpp
 xtistrm.obj : xtistrm.cpp
 xtixml.obj : xtixml.cpp
 uri.obj : uri.cpp
+dpycmn.obj : dpycmn.cpp

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 1a0407e87bf790f56bb78cece0d676dd723a0d75..1008b0c3b4a7a95b99a92f26b3957512c58324ee 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -231,6 +231,7 @@ splash.obj : splash.cpp
 timer.obj : timer.cpp
 vlbox.obj : vlbox.cpp
 vscroll.obj : vscroll.cpp
+       cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn vscroll.cpp
 listbkg.obj : listbkg.cpp
 choicbkg.obj : choicbkg.cpp
 toolbkg.obj : toolbkg.cpp

diff --git a/src/gtk/descrip.mms b/src/gtk/descrip.mms
index c836e9f5c912d6b602e12f8571401640a5f0197d..d11df004d075640b22ce0af5d4622112aff12710 100644 (file)
--- a/src/gtk/descrip.mms
+++ b/src/gtk/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 13 February 2006                                                    *
+# Date : 20 February 2006                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -39,6 +39,7 @@ OBJECTS = \
        bitmap.obj,\
        brush.obj,\
        clipbrd.obj,\
+       colordlg.obj,\
        colour.obj,\
        cursor.obj,\
        data.obj,\
@@ -113,6 +114,7 @@ SOURCES =\
        checklst.cpp,\
        choice.cpp,\
        clipbrd.cpp,\
+       colordlg.cpp,\
        colour.cpp,\
         combobox.cpp,\
        control.cpp,\
@@ -198,6 +200,7 @@ checkbox.obj : checkbox.cpp
 checklst.obj : checklst.cpp
 choice.obj : choice.cpp
 clipbrd.obj :clipbrd.cpp
+colordlg.obj : colordlg.cpp
 colour.obj : colour.cpp
 combobox.obj : combobox.cpp
 control.obj : control.cpp

diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms
index 851ce12921b521e279a3cf75adb7613c116167b3..5aabe90bbe14307f336bdc2e181190360059dc2a 100644 (file)
--- a/src/unix/descrip.mms
+++ b/src/unix/descrip.mms
@@ -46,6 +46,7 @@ CC_DEFINE =
 OBJECTS =       baseunix.obj,\
                dialup.obj,\
                dir.obj,\
+               displayx11.obj,\
                dlunix.obj,\
                fontenum.obj,\
                fontutil.obj,\
@@ -64,6 +65,7 @@ OBJECTS =       baseunix.obj,\
 SOURCES =       baseunix.cpp,\
                dialup.cpp,\
                dir.cpp,\
+               displayx11.cpp,\
                dlunix.cpp,\
                fontenum.cpp,\
                fontutil.cpp,\
@@ -115,3 +117,4 @@ sound.obj : sound.cpp
 sound_sdl.obj : sound_sdl.cpp
 stdpaths.obj : stdpaths.cpp
 taskbarx11.obj : taskbarx11.cpp
+displayx11.obj : displayx11.cpp

diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp
index 2eae8ed4fed9c5bbc761ea2eab723d09424ba2ef..341ce07819de8e0326e0f2e0bee31e6c1962b7fb 100644 (file)
--- a/src/unix/displayx11.cpp
+++ b/src/unix/displayx11.cpp
@@ -33,11 +33,13 @@
  * Xlibint.h conflicts with a function declaration in wx/list.h.  */
 extern "C" {
   #include <X11/Xlib.h>
+#ifndef __VMS
   #include <X11/Xlibint.h>
-  #include <X11/extensions/Xinerama.h>
+# include <X11/extensions/Xinerama.h>
 #ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
   #include <X11/extensions/xf86vmode.h>
 #endif
+#endif
 }
 
 class wxDisplayUnixPriv
@@ -51,7 +53,8 @@ size_t wxDisplayBase::GetCount()
 {
   Display *disp = (Display*)wxGetDisplay();
 
-  if ( XineramaIsActive(disp) )
+#ifndef __VMS
+   if ( XineramaIsActive(disp) )
   {
     XineramaScreenInfo *screenarr;
     int numscreens;
@@ -60,6 +63,7 @@ size_t wxDisplayBase::GetCount()
     return numscreens;
   }
   else
+#endif   
   {
     return 1;
   }
@@ -69,7 +73,8 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
 {
   Display *disp = (Display*)wxGetDisplay();
 
-  if ( XineramaIsActive(disp) )
+#ifndef __VMS
+   if ( XineramaIsActive(disp) )
   {
     int which_screen = -1;
     XineramaScreenInfo *screenarr;
@@ -92,7 +97,8 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
     return which_screen;
   }
   else
-  {
+#endif
+     {
     wxSize size = wxGetDisplaySize();
     if (p.x >= 0 &&
         p.x < size.GetWidth() &&
@@ -110,7 +116,8 @@ wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ), m_priv( new wxDisp
 {
   Display *disp = (Display*)wxGetDisplay();
 
-  if ( XineramaIsActive(disp) )
+#ifndef __VMS
+   if ( XineramaIsActive(disp) )
   {
     XineramaScreenInfo *screenarr;
     int numscreens;
@@ -122,7 +129,8 @@ wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ), m_priv( new wxDisp
     XFree(screenarr);
   }
   else
-  {
+#endif
+     {
     wxSize size = wxGetDisplaySize();
     m_priv->m_rect = wxRect(0, 0, size.GetWidth(), size.GetHeight());
     m_priv->m_depth = wxDisplayDepth();