Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Name conflict correction.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-03-04 19:19:19 +00:00
parent 863e0817fe
commit be51756712
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/opengl/cube/cube.cpp
View File

@@ -32,7 +32,7 @@
#include "cube.h" #include "cube.h"
#include "../../sample.xpm" #include "../../sample.xpm"
#ifndef __WXMSW__ // for wxStopWatch, see remark below #ifndef __WXMSW__ // for StopWatch, see remark below
#if defined(__WXMAC__) && !defined(__DARWIN__) #if defined(__WXMAC__) && !defined(__DARWIN__)
#include <utime.h> #include <utime.h>
#include <unistd.h> #include <unistd.h>
@@ -136,7 +136,7 @@ int ScanCodeDialog::GetValue()
in time (in sec) (because current version of wxGetElapsedTime doesn<73>t in time (in sec) (because current version of wxGetElapsedTime doesn<73>t
works right with glibc-2.1 and linux, at least for me) 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; unsigned long secs,msec;
@@ -373,7 +373,7 @@ void TestGLCanvas::OnKeyDown( wxKeyEvent& event )
{ {
m_TimeInitialized = 1; m_TimeInitialized = 1;
m_xsynct = event.GetTimestamp(); m_xsynct = event.GetTimestamp();
m_gsynct = wxStopWatch(&m_secbase); m_gsynct = StopWatch(&m_secbase);
m_Key = evkey; m_Key = evkey;
m_StartTime = 0; m_StartTime = 0;
@@ -394,9 +394,9 @@ void TestGLCanvas::OnKeyDown( wxKeyEvent& event )
Action( m_Key, m_LastTime-m_StartTime, currTime-m_StartTime ); Action( m_Key, m_LastTime-m_StartTime, currTime-m_StartTime );
#if defined(__WXMAC__) && !defined(__DARWIN__) #if defined(__WXMAC__) && !defined(__DARWIN__)
m_LastRedraw = currTime; // wxStopWatch() doesn't work on Mac... m_LastRedraw = currTime; // StopWatch() doesn't work on Mac...
#else #else
m_LastRedraw = wxStopWatch(&m_secbase) - m_gsynct; m_LastRedraw = StopWatch(&m_secbase) - m_gsynct;
#endif #endif
m_LastTime = currTime; m_LastTime = currTime;
} }