// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma implementation
-#pragma interface
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#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 <utime.h>
#include <unistd.h>
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;
m_rright = WXK_RIGHT;
}
-TestGLCanvas::TestGLCanvas(wxWindow *parent, const TestGLCanvas &other,
+TestGLCanvas::TestGLCanvas(wxWindow *parent, const TestGLCanvas *other,
wxWindowID id, const wxPoint& pos, const wxSize& size, long style,
const wxString& name )
- : wxGLCanvas(parent, other.GetContext(), id, pos, size, style|wxFULL_REPAINT_ON_RESIZE , name)
+ : wxGLCanvas(parent, other->GetContext(), id, pos, size, style|wxFULL_REPAINT_ON_RESIZE , name)
{
m_init = false;
- m_gllist = other.m_gllist; // share display list
+ m_gllist = other->m_gllist; // share display list
m_rleft = WXK_LEFT;
m_rright = WXK_RIGHT;
}
{
m_TimeInitialized = 1;
m_xsynct = event.GetTimestamp();
- m_gsynct = wxStopWatch(&m_secbase);
+ m_gsynct = StopWatch(&m_secbase);
m_Key = evkey;
m_StartTime = 0;
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;
}
bool MyApp::OnInit()
{
+ if ( !wxApp::OnInit() )
+ return false;
+
// Create the main frame window
(void) MyFrame::Create(NULL);