X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d705dfa81cd65de8fe900a45b80494fa201ef0a..2d611b5cf26c2b16ba3a7d91d79d06e759be2b3d:/samples/opengl/cube/cube.cpp?ds=inline diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp index a617a4c756..cf6c3818d9 100644 --- a/samples/opengl/cube/cube.cpp +++ b/samples/opengl/cube/cube.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma implementation #pragma interface #endif @@ -78,7 +78,7 @@ ScanCodeCtrl::ScanCodeCtrl( wxWindow* parent, wxWindowID id, int code, void ScanCodeCtrl::OnKeyDown( wxKeyEvent& event ) { wxString buf; - buf.Printf( "0x%04x", event.KeyCode() ); + buf.Printf( "0x%04x", event.GetKeyCode() ); SetValue( buf ); } @@ -279,8 +279,8 @@ void TestGLCanvas::OnSize(wxSizeEvent& event) wxGLCanvas::OnSize(event); // set GL viewport (not called by wxGLCanvas::OnSize on all platforms...) - int w, h; - GetClientSize(&w, &h); + int w, h; + GetClientSize(&w, &h); #ifndef __WXMOTIF__ if (GetContext()) #endif @@ -357,7 +357,7 @@ void TestGLCanvas::Action( long code, unsigned long lasttime, void TestGLCanvas::OnKeyDown( wxKeyEvent& event ) { - long evkey = event.KeyCode(); + long evkey = event.GetKeyCode(); if (evkey == 0) return; if (!m_TimeInitialized) @@ -385,7 +385,7 @@ 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; // wxStopWatch() doesn't work on Mac... #else m_LastRedraw = wxStopWatch(&m_secbase) - m_gsynct; #endif