fixes to previous commit

[wxWidgets.git] / samples / opengl / cube / cube.cpp

diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp
index a617a4c7562dc950cd1de902c2a77cb0b65ff80d..cf6c3818d936de319976c57ab5d4709f0e89638f 100644 (file)
--- a/samples/opengl/cube/cube.cpp
+++ b/samples/opengl/cube/cube.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma implementation
 #pragma interface
 #endif
 #pragma implementation
 #pragma interface
 #endif


@@ -78,7 +78,7 @@ ScanCodeCtrl::ScanCodeCtrl( wxWindow* parent, wxWindowID id, int code,
 
 void ScanCodeCtrl::OnKeyDown( wxKeyEvent& event )
 { wxString buf;
 
 void ScanCodeCtrl::OnKeyDown( wxKeyEvent& event )
 { wxString buf;

-  buf.Printf( "0x%04x", event.KeyCode() );
+  buf.Printf( "0x%04x", event.GetKeyCode() );

   SetValue( buf );
 }
 
   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...)
     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
 #ifndef __WXMOTIF__
     if (GetContext())
 #endif


@@ -357,7 +357,7 @@ void TestGLCanvas::Action( long code, unsigned long lasttime,
 
 void TestGLCanvas::OnKeyDown( wxKeyEvent& event )
 {
 
 void TestGLCanvas::OnKeyDown( wxKeyEvent& event )
 {

-    long evkey = event.KeyCode();
+    long evkey = event.GetKeyCode();

     if (evkey == 0) return;
 
     if (!m_TimeInitialized)
     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__)
         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
 #else
         m_LastRedraw = wxStopWatch(&m_secbase) - m_gsynct;
 #endif