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 0cbe0b83af9603a03c5884126202c23c5475a68b..0c4d7e852f40c889bca01fd5926e91071060f3db 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -154,7 +154,7 @@
  * Use OpenGL
  */
 #define wxUSE_OPENGL 1
  * Use OpenGL
  */
 #define wxUSE_OPENGL 1

-
+#define wxUSE_GLCANVAS 1

 /*
  * Use GUI
  */
 /*
  * Use GUI
  */

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 3ee44f17578b10d8a43f3ef93ca50674c945b249..5f6f2f05a772274279a3fa0a81ff5d68a7d586d9 100644 (file)
--- 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));
     }
         val *= tp.tv_sec;
         return (val + (tp.tv_usec / 1000));
     }

+   return 0;

 #elif defined(HAVE_FTIME)
     struct timeb tp;
     if ( ftime(&tp) == 0 )
 #elif defined(HAVE_FTIME)
     struct timeb tp;
     if ( ftime(&tp) == 0 )