Updates for VMS : new Makefiles, proper type casts

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

diff --git a/setup.h_vms b/setup.h_vms
index c4b8bf93ec1796feea5c031b90e690871b8efd7d..97281e3b6801207f9b12cbc24127060aede07cf0 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 : 5 March 2008                                                       *
+ * Date : 9 April 2008                                                       *
  *                                                                           *
  *****************************************************************************/
 
@@ -976,6 +976,12 @@ typedef pid_t GPid;
  * with 'char*' for the 3rd parameter instead of 'const char*' */
 #undef HAVE_BROKEN_VSNPRINTF_DECL
 
+/* Define if you have vsscanf() */
+#define HAVE_VSSCANF 1
+
+/* Define if you have vsscanf() declaration in the header */
+#define HAVE_VSSCANF_DECL 1
+
 /* Define if you have usleep() */
 #define HAVE_USLEEP 1
 

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index c00584c408257efd17f45f5f54e04b389f623d14..085a27ef53fb1f8bde156fded781087056cfb154 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 : 10 January 2008                                                     *
+# Date : 9 April 2008                                                        *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -62,6 +62,7 @@ OBJECTS = \
                bmpbase.obj,\
                btncmn.obj,\
                bookctrl.obj,\
+               calctrlcmn.obj,\
                choiccmn.obj,\
                clipcmn.obj,\
                clntdata.obj,\
@@ -234,6 +235,7 @@ SOURCES = \
                bmpbase.cpp,\
                btncmn.cpp,\
                bookctrl.cpp,\
+               calctrlcmn.cpp,\
                cairo.cpp,\
                choiccmn.cpp,\
                clipcmn.cpp,\
@@ -630,3 +632,4 @@ filectrlcmn.obj : filectrlcmn.cpp
 cairo.obj : cairo.cpp
 overlaycmn.obj : overlaycmn.cpp
 windowid.obj : windowid.cpp
+calctrlcmn.obj : calctrlcmn.cpp

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index c08ec94b9ad3f95db6ef1db51e37fe66a92d7c56..cdcfc26713ad680b164d19341d1cc453193c34eb 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 3 January 2008                                                      *
+# Date : 8 April 2008                                                        *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -47,7 +47,7 @@ CC_DEFINE =
 OBJECTS = \
                aboutdlgg.obj,\
                busyinfo.obj,\
-               calctrl.obj,\
+               calctrlg.obj,\
                caret.obj,\
                choicbkg.obj,\
                choicdgg.obj,\
@@ -98,7 +98,7 @@ SOURCES = \
                accel.cpp,\
                animateg.cpp,\
                busyinfo.cpp,\
-               calctrl.cpp,\
+               calctrlg.cpp,\
                caret.cpp,\
                choicbkg.cpp,\
                choicdgg.cpp,\
@@ -208,7 +208,7 @@ aboutdlgg.obj : aboutdlgg.cpp
 accel.obj : accel.cpp
 animateg.obj : animateg.cpp
 busyinfo.obj : busyinfo.cpp
-calctrl.obj : calctrl.cpp
+calctrlg.obj : calctrlg.cpp
 caret.obj : caret.cpp
 choicdgg.obj : choicdgg.cpp
 clrpickerg.obj : clrpickerg.cpp

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index 2176913c624c387ab36d4ec3ebbefc786f7a5f7f..23e57a20b5856b5cf875b9f905defe36832e4efb 100644 (file)
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -1736,7 +1736,7 @@ void wxWindowDCImpl::SetPen( const wxPen &pen )
             pixel = m_backgroundPixel;
         else
         {
-            pixel = CalculatePixel(m_pen.GetColour(), m_currentColour, false);
+            pixel = CalculatePixel( (wxColour&) m_pen.GetColour(), m_currentColour, false);
         }
 
         // Finally, set the GC to the required colour
@@ -1898,7 +1898,7 @@ void wxWindowDCImpl::SetBrush( const wxBrush &brush )
     // must test m_logicalFunction, because it involves background!
     if (!sameColour || !GET_OPTIMIZATION || m_logicalFunction == wxXOR)
     {
-        WXPixel pixel = CalculatePixel(m_brush.GetColour(), m_currentColour, true);
+        WXPixel pixel = CalculatePixel( (wxColour&) m_brush.GetColour(), m_currentColour, true);
 
         if (pixel > -1)
             SetForegroundPixelWithLogicalFunction(pixel);

diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms
index 221a0f542f31103c619b839778537624dbaf5c71..14189627128598a505bfbec72edde70ce0f65a01 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 : 5 September 2007                                                    *
+# Date : 8 April 2008                                                        *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -43,7 +43,7 @@ CC_DEFINE =
 .c.obj :
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
-OBJECTS = appunix.obj,baseunix.obj,\
+OBJECTS = appunix.obj,apptraits.obj,\
                dialup.obj,\
                dir.obj,\
                displayx11.obj,\
@@ -63,7 +63,7 @@ OBJECTS = appunix.obj,baseunix.obj,\
                taskbarx11.obj,\
                timerunx.obj
 
-SOURCES = appunix.cpp,baseunix.cpp,\
+SOURCES = appunix.cpp,apptraits.cpp,\
                dialup.cpp,\
                dir.cpp,\
                displayx11.cpp,\
@@ -102,7 +102,7 @@ all : $(SOURCES)
 .endif
 
 appunix.obj : appunix.cpp
-baseunix.obj : baseunix.cpp
+apptraits.obj : apptraits.cpp
 dialup.obj : dialup.cpp
 dir.obj : dir.cpp
 dlunix.obj : dlunix.cpp

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 5b9a1f627d6c7be86b11b5120eaf85840a9e214f..7e8b8f23d53a2c21b29ba1e6ff4df77b7a5c2ca6 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -421,7 +421,7 @@ private:
     int m_argc;
     char **m_argv;
 
-    DECLARE_NO_COPY_CLASS(ArgsArray);
+    DECLARE_NO_COPY_CLASS(ArgsArray)
 };
 
 } // anonymous namespace