compate charset names case-insensitively in GetEncodingFromName()

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

diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp
index 997b37131b7bd3670ac61a77dce92b8347fcb27b..66bac043e0ea2b2e13dcd9b2f55af4e062ce70ad 100644 (file)
--- a/samples/opengl/cube/cube.cpp
+++ b/samples/opengl/cube/cube.cpp
@@ -6,10 +6,10 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

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

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


@@ -25,17 +25,21 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#include "wx/log.h"
-

 #if !wxUSE_GLCANVAS
 #if !wxUSE_GLCANVAS

-#error Please set wxUSE_GLCANVAS to 1 in setup.h.
+    #error "OpenGL required: set wxUSE_GLCANVAS to 1 and rebuild the library"

 #endif
 
 #include "cube.h"
 #endif
 
 #include "cube.h"

-
-#ifndef __WXMSW__     // for wxStopWatch, see remark below 
-#include <sys/time.h>
-#include <sys/unistd.h>
+#include "../../sample.xpm"
+
+#ifndef __WXMSW__     // for StopWatch, see remark below
+  #if defined(__WXMAC__) && !defined(__DARWIN__)
+    #include <utime.h>
+    #include <unistd.h>
+  #else
+    #include <sys/time.h>
+    #include <sys/unistd.h>
+  #endif

 #else
 #include <sys/timeb.h>
 #endif
 #else
 #include <sys/timeb.h>
 #endif


@@ -50,31 +54,37 @@
 class ScanCodeCtrl : public wxTextCtrl
 {
 public:
 class ScanCodeCtrl : public wxTextCtrl
 {
 public:

-  ScanCodeCtrl( wxWindow* parent, wxWindowID id, int code,
-                const wxPoint& pos, const wxSize& size );
-  void OnChar( wxKeyEvent& event ) { } /* do nothing */
-  void OnKeyDown(wxKeyEvent& event);
+    ScanCodeCtrl( wxWindow* parent, wxWindowID id, int code,
+        const wxPoint& pos, const wxSize& size );
+
+    void OnChar( wxKeyEvent& WXUNUSED(event) )
+    {
+        // Do nothing
+    }
+
+    void OnKeyDown(wxKeyEvent& event);
+

 private:
 private:

-// any class wishing to process wxWindows events must use this macro
-  DECLARE_EVENT_TABLE()
+
+    // Any class wishing to process wxWidgets events must use this macro
+    DECLARE_EVENT_TABLE()

 };
 };

+

 BEGIN_EVENT_TABLE( ScanCodeCtrl, wxTextCtrl )
 BEGIN_EVENT_TABLE( ScanCodeCtrl, wxTextCtrl )

-  EVT_CHAR( ScanCodeCtrl::OnChar )
-  EVT_KEY_DOWN( ScanCodeCtrl::OnKeyDown )
+    EVT_CHAR( ScanCodeCtrl::OnChar )
+    EVT_KEY_DOWN( ScanCodeCtrl::OnKeyDown )

 END_EVENT_TABLE()
 
 ScanCodeCtrl::ScanCodeCtrl( wxWindow* parent, wxWindowID id, int code,
 END_EVENT_TABLE()
 
 ScanCodeCtrl::ScanCodeCtrl( wxWindow* parent, wxWindowID id, int code,

-                             const wxPoint& pos, const wxSize& size )
-                  : wxTextCtrl( parent, id, "", pos, size )
-{ wxString buf;
-  buf.Printf( "0x%04x", code );
-  SetValue( buf );
+    const wxPoint& pos, const wxSize& size )
+    : wxTextCtrl( parent, id, wxEmptyString, pos, size )
+{
+    SetValue( wxString::Format(wxT("0x%04x"), code) );

 }
 
 void ScanCodeCtrl::OnKeyDown( wxKeyEvent& event )
 }
 
 void ScanCodeCtrl::OnKeyDown( wxKeyEvent& event )

-{ wxString buf;
-  buf.Printf( "0x%04x", event.KeyCode() );
-  SetValue( buf );
+{
+    SetValue( wxString::Format(wxT("0x%04x"), event.GetKeyCode()) );

 }
 
 /*------------------------------------------------------------------
 }
 
 /*------------------------------------------------------------------


@@ -84,69 +94,72 @@ void ScanCodeCtrl::OnKeyDown( wxKeyEvent& event )
 class ScanCodeDialog : public wxDialog
 {
 public:
 class ScanCodeDialog : public wxDialog
 {
 public:

-  ScanCodeDialog( wxWindow* parent, wxWindowID id, const int code,
-                  const wxString &descr, const wxString& title );
-  int GetValue(); 
+    ScanCodeDialog( wxWindow* parent, wxWindowID id, const int code,
+        const wxString &descr, const wxString& title );
+    int GetValue();
+

 private:
 private:

-  ScanCodeCtrl       *m_ScanCode;
-  wxTextCtrl         *m_Description;
+
+    ScanCodeCtrl       *m_ScanCode;
+    wxTextCtrl         *m_Description;

 };
 
 };
 

-ScanCodeDialog::ScanCodeDialog( wxWindow* parent, wxWindowID id, 
-               const int code, const wxString &descr, const wxString& title )
-          : wxDialog( parent, id, title, wxPoint(-1, -1), wxSize(96*2,76*2) )
+ScanCodeDialog::ScanCodeDialog( wxWindow* parent, wxWindowID id,
+    const int code, const wxString &descr, const wxString& title )
+    : wxDialog( parent, id, title, wxDefaultPosition, wxSize(96*2,76*2) )

 {
 {

-  new wxStaticText( this, -1, "Scancode", wxPoint(4*2,3*2), 
-                    wxSize(31*2,12*2) );
-  m_ScanCode = new ScanCodeCtrl( this, -1, code, wxPoint(37*2,6*2), 
-                                 wxSize(53*2,14*2) );
-
-  new wxStaticText( this, -1, "Description", wxPoint(4*2,24*2),
-                    wxSize(32*2,12*2) );
-  m_Description = new wxTextCtrl( this, -1, descr, wxPoint(37*2,27*2),
-                                  wxSize(53*2,14*2) );
-
-  new wxButton( this, wxID_OK, "Ok", wxPoint(20*2,50*2), wxSize(20*2,13*2) );
-  new wxButton( this, wxID_CANCEL, "Cancel", wxPoint(44*2,50*2),
-                wxSize(25*2,13*2) );
+    new wxStaticText( this, wxID_ANY, _T("Scancode"), wxPoint(4*2,3*2),
+        wxSize(31*2,12*2) );
+    m_ScanCode = new ScanCodeCtrl( this, wxID_ANY, code, wxPoint(37*2,6*2),
+        wxSize(53*2,14*2) );
+
+    new wxStaticText( this, wxID_ANY, _T("Description"), wxPoint(4*2,24*2),
+        wxSize(32*2,12*2) );
+    m_Description = new wxTextCtrl( this, wxID_ANY, descr, wxPoint(37*2,27*2),
+        wxSize(53*2,14*2) );
+
+    new wxButton( this, wxID_OK, _T("Ok"), wxPoint(20*2,50*2), wxSize(20*2,13*2) );
+    new wxButton( this, wxID_CANCEL, _T("Cancel"), wxPoint(44*2,50*2),
+        wxSize(25*2,13*2) );

 }
 
 int ScanCodeDialog::GetValue()
 {
 }
 
 int ScanCodeDialog::GetValue()
 {

-  int code;
-  wxString buf = m_ScanCode->GetValue();
-  sscanf( buf.c_str(), "%i", &code );
-  return( code );
+    int code;
+    wxString buf = m_ScanCode->GetValue();
+    wxSscanf( buf.c_str(), _T("%i"), &code );
+    return code;

 }
 
 /*----------------------------------------------------------------------
   Utility function to get the elapsed time (in msec) since a given point
 }
 
 /*----------------------------------------------------------------------
   Utility function to get the elapsed time (in msec) since a given point

-  in time (in sec)  (because current version of wxGetElapsedTime doesn´t 
-  works right with glibc-2.1 and linux, at least for me) 
+  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;
 
 {
   unsigned long secs,msec;
 

-#ifndef __WXMSW__        // think every unice has gettimeofday
-  struct timeval tv;
-  gettimeofday( &tv, (struct timezone *)NULL );
-  secs = tv.tv_sec;
-  msec = tv.tv_usec/1000;
-#else
+#if defined(__WXMSW__)

   struct timeb tb;
   struct timeb tb;

-

   ftime( &tb );
   ftime( &tb );

-

   secs = tb.time;
   secs = tb.time;

-

   msec = tb.millitm;
   msec = tb.millitm;

-
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+  wxLongLong tl = wxGetLocalTimeMillis();
+  secs = (unsigned long) (tl.GetValue() / 1000);
+  msec = (unsigned long) (tl.GetValue() - secs*1000);
+#else
+  // think every unice has gettimeofday
+  struct timeval tv;
+  gettimeofday( &tv, (struct timezone *)NULL );
+  secs = tv.tv_sec;
+  msec = tv.tv_usec/1000;

 #endif
 
   if( *sec_base == 0 )
     *sec_base = secs;
 #endif
 
   if( *sec_base == 0 )
     *sec_base = secs;

-    
+

   return( (secs-*sec_base)*1000 + msec );
 }
 
   return( (secs-*sec_base)*1000 + msec );
 }
 


@@ -155,12 +168,12 @@ unsigned long wxStopWatch( unsigned long *sec_base )
 -----------------------------------------------------------------*/
 
 BEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas)
 -----------------------------------------------------------------*/
 
 BEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas)

-  EVT_SIZE(TestGLCanvas::OnSize)
-  EVT_PAINT(TestGLCanvas::OnPaint)
-  EVT_ERASE_BACKGROUND(TestGLCanvas::OnEraseBackground)
-  EVT_KEY_DOWN( TestGLCanvas::OnKeyDown )
-  EVT_KEY_UP( TestGLCanvas::OnKeyUp )
-  EVT_ENTER_WINDOW( TestGLCanvas::OnEnterWindow )
+    EVT_SIZE(TestGLCanvas::OnSize)
+    EVT_PAINT(TestGLCanvas::OnPaint)
+    EVT_ERASE_BACKGROUND(TestGLCanvas::OnEraseBackground)
+    EVT_KEY_DOWN( TestGLCanvas::OnKeyDown )
+    EVT_KEY_UP( TestGLCanvas::OnKeyUp )
+    EVT_ENTER_WINDOW( TestGLCanvas::OnEnterWindow )

 END_EVENT_TABLE()
 
 unsigned long  TestGLCanvas::m_secbase = 0;
 END_EVENT_TABLE()
 
 unsigned long  TestGLCanvas::m_secbase = 0;


@@ -169,22 +182,22 @@ unsigned long  TestGLCanvas::m_xsynct;
 unsigned long  TestGLCanvas::m_gsynct;
 
 TestGLCanvas::TestGLCanvas(wxWindow *parent, wxWindowID id,
 unsigned long  TestGLCanvas::m_gsynct;
 
 TestGLCanvas::TestGLCanvas(wxWindow *parent, wxWindowID id,

-    const wxPoint& pos, const wxSize& size, long style, const wxString& name):
-  wxGLCanvas(parent, (wxGLCanvas*) NULL, id, pos, size, style, name )
+    const wxPoint& pos, const wxSize& size, long style, const wxString& name)
+    : wxGLCanvas(parent, (wxGLCanvas*) NULL, id, pos, size, style|wxFULL_REPAINT_ON_RESIZE , name )

 {
 {

-    m_init = FALSE;
+    m_init = false;

     m_gllist = 0;
     m_rleft = WXK_LEFT;
     m_rright = WXK_RIGHT;
 }
 
     m_gllist = 0;
     m_rleft = WXK_LEFT;
     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,
     wxWindowID id, const wxPoint& pos, const wxSize& size, long style,

-    const wxString& name ) :
-      wxGLCanvas(parent, other.GetContext(), id, pos, size, style, name  )
+    const wxString& 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_init = false;
+    m_gllist = other->m_gllist; // share display list

     m_rleft = WXK_LEFT;
     m_rright = WXK_RIGHT;
 }
     m_rleft = WXK_LEFT;
     m_rright = WXK_RIGHT;
 }


@@ -202,81 +215,91 @@ void TestGLCanvas::Render()
 #endif
 
     SetCurrent();
 #endif
 
     SetCurrent();

-    /* init OpenGL once, but after SetCurrent */
+    // Init OpenGL once, but after SetCurrent

     if (!m_init)
     {
         InitGL();
     if (!m_init)
     {
         InitGL();

-        m_init = TRUE;
+        m_init = true;

     }
     }

-    
+
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glFrustum(-0.5f, 0.5f, -0.5f, 0.5f, 1.0f, 3.0f);
+    glMatrixMode(GL_MODELVIEW);
+

     /* clear color and depth buffers */
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
     /* clear color and depth buffers */
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 

-  if( m_gllist == 0 )
-  {
-    m_gllist = glGenLists( 1 );
-    glNewList( m_gllist, GL_COMPILE_AND_EXECUTE );        
-    /* draw six faces of a cube */
-    glBegin(GL_QUADS);
-    glNormal3f( 0.0F, 0.0F, 1.0F);
-    glVertex3f( 0.5F, 0.5F, 0.5F); glVertex3f(-0.5F, 0.5F, 0.5F);
-    glVertex3f(-0.5F,-0.5F, 0.5F); glVertex3f( 0.5F,-0.5F, 0.5F);
-
-    glNormal3f( 0.0F, 0.0F,-1.0F);
-    glVertex3f(-0.5F,-0.5F,-0.5F); glVertex3f(-0.5F, 0.5F,-0.5F);
-    glVertex3f( 0.5F, 0.5F,-0.5F); glVertex3f( 0.5F,-0.5F,-0.5F);
-
-    glNormal3f( 0.0F, 1.0F, 0.0F);
-    glVertex3f( 0.5F, 0.5F, 0.5F); glVertex3f( 0.5F, 0.5F,-0.5F);
-    glVertex3f(-0.5F, 0.5F,-0.5F); glVertex3f(-0.5F, 0.5F, 0.5F);
-
-    glNormal3f( 0.0F,-1.0F, 0.0F);
-    glVertex3f(-0.5F,-0.5F,-0.5F); glVertex3f( 0.5F,-0.5F,-0.5F);
-    glVertex3f( 0.5F,-0.5F, 0.5F); glVertex3f(-0.5F,-0.5F, 0.5F);
-
-    glNormal3f( 1.0F, 0.0F, 0.0F);
-    glVertex3f( 0.5F, 0.5F, 0.5F); glVertex3f( 0.5F,-0.5F, 0.5F);
-    glVertex3f( 0.5F,-0.5F,-0.5F); glVertex3f( 0.5F, 0.5F,-0.5F);
-
-    glNormal3f(-1.0F, 0.0F, 0.0F);
-    glVertex3f(-0.5F,-0.5F,-0.5F); glVertex3f(-0.5F,-0.5F, 0.5F);
-    glVertex3f(-0.5F, 0.5F, 0.5F); glVertex3f(-0.5F, 0.5F,-0.5F);
-    glEnd();
-
-    glEndList();
-  }
-  else
-    glCallList( m_gllist );    
+    if( m_gllist == 0 )
+    {
+        m_gllist = glGenLists( 1 );
+        glNewList( m_gllist, GL_COMPILE_AND_EXECUTE );
+        /* draw six faces of a cube */
+        glBegin(GL_QUADS);
+        glNormal3f( 0.0f, 0.0f, 1.0f);
+        glVertex3f( 0.5f, 0.5f, 0.5f); glVertex3f(-0.5f, 0.5f, 0.5f);
+        glVertex3f(-0.5f,-0.5f, 0.5f); glVertex3f( 0.5f,-0.5f, 0.5f);
+
+        glNormal3f( 0.0f, 0.0f,-1.0f);
+        glVertex3f(-0.5f,-0.5f,-0.5f); glVertex3f(-0.5f, 0.5f,-0.5f);
+        glVertex3f( 0.5f, 0.5f,-0.5f); glVertex3f( 0.5f,-0.5f,-0.5f);
+
+        glNormal3f( 0.0f, 1.0f, 0.0f);
+        glVertex3f( 0.5f, 0.5f, 0.5f); glVertex3f( 0.5f, 0.5f,-0.5f);
+        glVertex3f(-0.5f, 0.5f,-0.5f); glVertex3f(-0.5f, 0.5f, 0.5f);
+
+        glNormal3f( 0.0f,-1.0f, 0.0f);
+        glVertex3f(-0.5f,-0.5f,-0.5f); glVertex3f( 0.5f,-0.5f,-0.5f);
+        glVertex3f( 0.5f,-0.5f, 0.5f); glVertex3f(-0.5f,-0.5f, 0.5f);
+
+        glNormal3f( 1.0f, 0.0f, 0.0f);
+        glVertex3f( 0.5f, 0.5f, 0.5f); glVertex3f( 0.5f,-0.5f, 0.5f);
+        glVertex3f( 0.5f,-0.5f,-0.5f); glVertex3f( 0.5f, 0.5f,-0.5f);
+
+        glNormal3f(-1.0f, 0.0f, 0.0f);
+        glVertex3f(-0.5f,-0.5f,-0.5f); glVertex3f(-0.5f,-0.5f, 0.5f);
+        glVertex3f(-0.5f, 0.5f, 0.5f); glVertex3f(-0.5f, 0.5f,-0.5f);
+        glEnd();
+
+        glEndList();
+    }
+    else
+    {
+        glCallList(m_gllist);
+    }

 
 

-  glFlush();
-  SwapBuffers();
+    glFlush();
+    SwapBuffers();

 }
 
 }
 

-void TestGLCanvas::OnEnterWindow( wxMouseEvent& event )
+void TestGLCanvas::OnEnterWindow( wxMouseEvent& WXUNUSED(event) )

 {
     SetFocus();
 }
 
 {
     SetFocus();
 }
 

-void TestGLCanvas::OnPaint( wxPaintEvent& event )
+void TestGLCanvas::OnPaint( wxPaintEvent& WXUNUSED(event) )

 {
     Render();
 }
 
 void TestGLCanvas::OnSize(wxSizeEvent& event)
 {
 {
     Render();
 }
 
 void TestGLCanvas::OnSize(wxSizeEvent& event)
 {

-    int width, height;
-    GetClientSize(& width, & height);
+    // this is also necessary to update the context on some platforms
+    wxGLCanvas::OnSize(event);

 
 

+    // set GL viewport (not called by wxGLCanvas::OnSize on all platforms...)
+    int w, h;
+    GetClientSize(&w, &h);

 #ifndef __WXMOTIF__
     if (GetContext())
 #endif
     {
         SetCurrent();
 #ifndef __WXMOTIF__
     if (GetContext())
 #endif
     {
         SetCurrent();

-        glViewport(0, 0, width, height);
+        glViewport(0, 0, (GLint) w, (GLint) h);

     }
 }
 
     }
 }
 

-void TestGLCanvas::OnEraseBackground(wxEraseEvent& event)
+void TestGLCanvas::OnEraseBackground(wxEraseEvent& WXUNUSED(event))

 {
   // Do nothing, to avoid flashing.
 }
 {
   // Do nothing, to avoid flashing.
 }


@@ -284,18 +307,18 @@ void TestGLCanvas::OnEraseBackground(wxEraseEvent& event)
 void TestGLCanvas::InitGL()
 {
     SetCurrent();
 void TestGLCanvas::InitGL()
 {
     SetCurrent();

-    
+

     /* set viewing projection */
     glMatrixMode(GL_PROJECTION);
     /* set viewing projection */
     glMatrixMode(GL_PROJECTION);

-    glFrustum(-0.5F, 0.5F, -0.5F, 0.5F, 1.0F, 3.0F);
+    glFrustum(-0.5f, 0.5f, -0.5f, 0.5f, 1.0f, 3.0f);

 
     /* position viewer */
     glMatrixMode(GL_MODELVIEW);
 
     /* position viewer */
     glMatrixMode(GL_MODELVIEW);

-    glTranslatef(0.0F, 0.0F, -2.0F);
+    glTranslatef(0.0f, 0.0f, -2.0f);

 
     /* position object */
 
     /* position object */

-    glRotatef(30.0F, 1.0F, 0.0F, 0.0F);
-    glRotatef(30.0F, 0.0F, 1.0F, 0.0F);
+    glRotatef(30.0f, 1.0f, 0.0f, 0.0f);
+    glRotatef(30.0f, 0.0f, 1.0f, 0.0f);

 
     glEnable(GL_DEPTH_TEST);
     glEnable(GL_LIGHTING);
 
     glEnable(GL_DEPTH_TEST);
     glEnable(GL_LIGHTING);


@@ -326,7 +349,7 @@ GLfloat TestGLCanvas::CalcRotateAngle( unsigned long lasttime,
     t = ((GLfloat)(acceltime - lasttime)) / 1000.0f;
     s1 = CalcRotateSpeed( lasttime );
     s2 = CalcRotateSpeed( acceltime );
     t = ((GLfloat)(acceltime - lasttime)) / 1000.0f;
     s1 = CalcRotateSpeed( lasttime );
     s2 = CalcRotateSpeed( acceltime );

-    
+

     return( t * (s1 + s2) * 135.0f );
 }
 
     return( t * (s1 + s2) * 135.0f );
 }
 


@@ -335,22 +358,22 @@ void TestGLCanvas::Action( long code, unsigned long lasttime,
 {
     GLfloat angle = CalcRotateAngle( lasttime, acceltime );
 
 {
     GLfloat angle = CalcRotateAngle( lasttime, acceltime );
 

-    if (code == m_rleft) 
+    if (code == m_rleft)

         Rotate( angle );
         Rotate( angle );

-    else if (code == m_rright) 
+    else if (code == m_rright)

             Rotate( -angle );
 }
 
 void TestGLCanvas::OnKeyDown( wxKeyEvent& event )
 {
             Rotate( -angle );
 }
 
 void TestGLCanvas::OnKeyDown( wxKeyEvent& event )
 {

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

     if (evkey == 0) return;
 
     if (!m_TimeInitialized)
     {
         m_TimeInitialized = 1;
     if (evkey == 0) return;
 
     if (!m_TimeInitialized)
     {
         m_TimeInitialized = 1;

-        m_xsynct = event.m_timeStamp;
-        m_gsynct = wxStopWatch(&m_secbase);
+        m_xsynct = event.GetTimestamp();
+        m_gsynct = StopWatch(&m_secbase);

 
         m_Key = evkey;
         m_StartTime = 0;
 
         m_Key = evkey;
         m_StartTime = 0;


@@ -358,8 +381,8 @@ void TestGLCanvas::OnKeyDown( wxKeyEvent& event )
         m_LastRedraw = 0;
     }
 
         m_LastRedraw = 0;
     }
 

-    unsigned long currTime = event.m_timeStamp - m_xsynct;
-  
+    unsigned long currTime = event.GetTimestamp() - m_xsynct;
+

     if (evkey != m_Key)
     {
         m_Key = evkey;
     if (evkey != m_Key)
     {
         m_Key = evkey;


@@ -369,11 +392,15 @@ void TestGLCanvas::OnKeyDown( wxKeyEvent& event )
     if (currTime >= m_LastRedraw)      // Redraw:
     {
         Action( m_Key, m_LastTime-m_StartTime, currTime-m_StartTime );
     if (currTime >= m_LastRedraw)      // Redraw:
     {
         Action( m_Key, m_LastTime-m_StartTime, currTime-m_StartTime );

-                  
-        m_LastRedraw = wxStopWatch(&m_secbase) - m_gsynct;
+
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+        m_LastRedraw = currTime;    // StopWatch() doesn't work on Mac...
+#else
+        m_LastRedraw = StopWatch(&m_secbase) - m_gsynct;
+#endif

         m_LastTime = currTime;
     }
         m_LastTime = currTime;
     }

-    
+

     event.Skip();
 }
 
     event.Skip();
 }
 


@@ -383,7 +410,7 @@ void TestGLCanvas::OnKeyUp( wxKeyEvent& event )
     m_StartTime = 0;
     m_LastTime = 0;
     m_LastRedraw = 0;
     m_StartTime = 0;
     m_LastTime = 0;
     m_LastRedraw = 0;

-    
+

     event.Skip();
 }
 
     event.Skip();
 }
 


@@ -392,8 +419,8 @@ void TestGLCanvas::Rotate( GLfloat deg )
     SetCurrent();
 
     glMatrixMode(GL_MODELVIEW);
     SetCurrent();
 
     glMatrixMode(GL_MODELVIEW);

-    glRotatef((GLfloat)deg, 0.0F, 0.0F, 1.0F);
-    Refresh(FALSE);
+    glRotatef((GLfloat)deg, 0.0f, 0.0f, 1.0f);
+    Refresh(false);

 }
 
 
 }
 
 


@@ -409,104 +436,98 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()
 
 // My frame constructor
 END_EVENT_TABLE()
 
 // My frame constructor

-MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
-                 const wxSize& size, long style) 
-         : wxFrame(frame, -1, title, pos, size, style)
+MyFrame::MyFrame(wxWindow *parent, const wxString& title, const wxPoint& pos,
+    const wxSize& size, long style)
+    : wxFrame(parent, wxID_ANY, title, pos, size, style)

 {
     m_canvas = NULL;
 {
     m_canvas = NULL;

+    SetIcon(wxIcon(sample_xpm));

 }
 
 // Intercept menu commands
 }
 
 // Intercept menu commands

-void MyFrame::OnExit(wxCommandEvent& event)
+void MyFrame::OnExit( wxCommandEvent& WXUNUSED(event) )

 {
 {

-    Destroy();
+    // true is to force the frame to close
+    Close(true);

 }
 
 }
 

-void MyFrame::OnNewWindow()
+/*static*/ MyFrame *MyFrame::Create(MyFrame *parentFrame, bool isCloneWindow)

 {
 {

-  MyFrame *frame = new MyFrame(NULL, "Cube OpenGL Demo Clone",
-                               wxPoint(50, 50), wxSize(400, 300));
-  // Give it an icon
-#ifdef __WXMSW__
-  frame->SetIcon(wxIcon("mondrian"));
-#endif
+    wxString str = wxT("wxWidgets OpenGL Cube Sample");
+    if (isCloneWindow) str += wxT(" - Clone");
+
+    MyFrame *frame = new MyFrame(NULL, str, wxDefaultPosition,
+        wxSize(400, 300));

 
 

-  // Make a menubar
-  wxMenu *winMenu = new wxMenu;
+    // Make a menubar
+    wxMenu *winMenu = new wxMenu;

 
 

-  winMenu->Append(wxID_EXIT, "&Close");
-  winMenu->Append(ID_NEW_WINDOW, "&New" );
-  wxMenuBar *menuBar = new wxMenuBar;
-  menuBar->Append(winMenu, "&Window");
+    winMenu->Append(wxID_EXIT, _T("&Close"));
+    winMenu->Append(ID_NEW_WINDOW, _T("&New") );
+    wxMenuBar *menuBar = new wxMenuBar;
+    menuBar->Append(winMenu, _T("&Window"));

 
 

-  winMenu = new wxMenu;
-  winMenu->Append(ID_DEF_ROTATE_LEFT_KEY, "Rotate &left");
-  winMenu->Append(ID_DEF_ROTATE_RIGHT_KEY, "Rotate &right");
-  menuBar->Append(winMenu, "&Key");
+    winMenu = new wxMenu;
+    winMenu->Append(ID_DEF_ROTATE_LEFT_KEY, _T("Rotate &left"));
+    winMenu->Append(ID_DEF_ROTATE_RIGHT_KEY, _T("Rotate &right"));
+    menuBar->Append(winMenu, _T("&Key"));

 
 

-  frame->SetMenuBar(menuBar);
+    frame->SetMenuBar(menuBar);

 
 

-  frame->m_canvas = new TestGLCanvas( frame, *m_canvas, -1, 
-               wxPoint(0, 0), wxSize(200, 200) );
-  
-  // Show the frame
-  frame->Show(TRUE);
+    if (parentFrame)
+    {
+        frame->m_canvas = new TestGLCanvas( frame, parentFrame->m_canvas,
+            wxID_ANY, wxDefaultPosition, wxDefaultSize );
+    }
+    else
+    {
+        frame->m_canvas = new TestGLCanvas(frame, wxID_ANY,
+            wxDefaultPosition, wxDefaultSize);
+    }
+
+    // Show the frame
+    frame->Show(true);
+
+    return frame;

 }
 
 }
 

-void MyFrame::OnDefRotateLeftKey()
+void MyFrame::OnNewWindow( wxCommandEvent& WXUNUSED(event) )

 {
 {

-  ScanCodeDialog dial( this, -1, m_canvas->m_rleft, 
-                       wxString("Left"), "Define key" );
-  int result = dial.ShowModal();
-  if( result == wxID_OK )
-    m_canvas->m_rleft = dial.GetValue();
+    (void) Create(this, true);

 }
 }

-void MyFrame::OnDefRotateRightKey()
+
+void MyFrame::OnDefRotateLeftKey( wxCommandEvent& WXUNUSED(event) )

 {
 {

-  ScanCodeDialog dial( this, -1, m_canvas->m_rright, 
-                       wxString("Right"), "Define key" );
-  int result = dial.ShowModal();
-  if( result == wxID_OK )
-    m_canvas->m_rright = dial.GetValue();
-}
+    ScanCodeDialog dial( this, wxID_ANY, m_canvas->m_rleft,
+        wxString(_T("Left")), _T("Define key") );

 
 

-/*------------------------------------------------------------------
-  Application object ( equivalent to main() )
------------------------------------------------------------------- */
+    int result = dial.ShowModal();

 
 

-IMPLEMENT_APP(MyApp)
+    if( result == wxID_OK )
+        m_canvas->m_rleft = dial.GetValue();
+}

 
 

-bool MyApp::OnInit(void)
+void MyFrame::OnDefRotateRightKey( wxCommandEvent& WXUNUSED(event) )

 {
 {

-  wxLog::SetTraceMask(wxTraceMessages);
-
-  // Create the main frame window
-  MyFrame *frame = new MyFrame(NULL, "Cube OpenGL Demo", wxPoint(50, 50),
-                               wxSize(400, 300));
-  // Give it an icon
-#ifdef wx_msw
-  frame->SetIcon(wxIcon("mondrian"));
-#endif
+    ScanCodeDialog dial( this, wxID_ANY, m_canvas->m_rright,
+        wxString(_T("Right")), _T("Define key") );

 
 

-  // Make a menubar
-  wxMenu *winMenu = new wxMenu;
+    int result = dial.ShowModal();

 
 

-  winMenu->Append(wxID_EXIT, "&Close");
-  winMenu->Append(ID_NEW_WINDOW, "&New" );
-  wxMenuBar *menuBar = new wxMenuBar;
-  menuBar->Append(winMenu, "&Window");
+    if( result == wxID_OK )
+        m_canvas->m_rright = dial.GetValue();
+}

 
 

-  winMenu = new wxMenu;
-  winMenu->Append(ID_DEF_ROTATE_LEFT_KEY, "Rotate &left");
-  winMenu->Append(ID_DEF_ROTATE_RIGHT_KEY, "Rotate &right");
-  menuBar->Append(winMenu, "&Key");
+/*------------------------------------------------------------------
+  Application object ( equivalent to main() )
+------------------------------------------------------------------ */

 
 

-  frame->SetMenuBar(menuBar);
+IMPLEMENT_APP(MyApp)

 
 

-  frame->m_canvas = new TestGLCanvas(frame, -1, wxPoint(0, 0), wxSize(200, 200));
+bool MyApp::OnInit()
+{
+    // Create the main frame window
+    (void) MyFrame::Create(NULL);

 
 

-  // Show the frame
-  frame->Show(TRUE);
-  
-  return TRUE;
+    return true;

 }
 }