From be517567127e43d1780cbe0232a035eec293f9b6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Fri, 4 Mar 2005 19:19:19 +0000 Subject: [PATCH] Name conflict correction. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/opengl/cube/cube.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp index eda0d5e612..ea9a826542 100644 --- a/samples/opengl/cube/cube.cpp +++ b/samples/opengl/cube/cube.cpp @@ -32,7 +32,7 @@ #include "cube.h" #include "../../sample.xpm" -#ifndef __WXMSW__ // for wxStopWatch, see remark below +#ifndef __WXMSW__ // for StopWatch, see remark below #if defined(__WXMAC__) && !defined(__DARWIN__) #include #include @@ -136,7 +136,7 @@ int ScanCodeDialog::GetValue() in time (in sec) (because current version of wxGetElapsedTime doesn´t works right with glibc-2.1 and linux, at least for me) -----------------------------------------------------------------------*/ -unsigned long wxStopWatch( unsigned long *sec_base ) +unsigned long StopWatch( unsigned long *sec_base ) { unsigned long secs,msec; @@ -373,7 +373,7 @@ void TestGLCanvas::OnKeyDown( wxKeyEvent& event ) { m_TimeInitialized = 1; m_xsynct = event.GetTimestamp(); - m_gsynct = wxStopWatch(&m_secbase); + m_gsynct = StopWatch(&m_secbase); m_Key = evkey; m_StartTime = 0; @@ -394,9 +394,9 @@ void TestGLCanvas::OnKeyDown( wxKeyEvent& event ) Action( m_Key, m_LastTime-m_StartTime, currTime-m_StartTime ); #if defined(__WXMAC__) && !defined(__DARWIN__) - m_LastRedraw = currTime; // wxStopWatch() doesn't work on Mac... + m_LastRedraw = currTime; // StopWatch() doesn't work on Mac... #else - m_LastRedraw = wxStopWatch(&m_secbase) - m_gsynct; + m_LastRedraw = StopWatch(&m_secbase) - m_gsynct; #endif m_LastTime = currTime; } -- 2.45.2