From: Jouk Jansen <joukj@hrem.nano.tudelft.nl>
Date: Thu, 2 Mar 2000 11:29:59 +0000 (+0000)
Subject:  Committing in .
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/61a021a82283308e8544d45589c2d1b86afbd545

 Committing in .

 Modified Files:
 	wxWindows/setup.h_vms wxWindows/src/common/timercmn.cpp
 ----------------------------------------------------------------------


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

diff --git a/setup.h_vms b/setup.h_vms
index 0cbe0b83af..0c4d7e852f 100644
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -154,7 +154,7 @@
  * Use OpenGL
  */
 #define wxUSE_OPENGL 1
-
+#define wxUSE_GLCANVAS 1
 /*
  * Use GUI
  */
diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 3ee44f1757..5f6f2f05a7 100644
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -248,6 +248,7 @@ wxLongLong wxGetLocalTimeMillis()
         val *= tp.tv_sec;
         return (val + (tp.tv_usec / 1000));
     }
+   return 0;
 #elif defined(HAVE_FTIME)
     struct timeb tp;
     if ( ftime(&tp) == 0 )