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 eda0d5e6122c403bffde318eefdf5f4451b92cf7..66bac043e0ea2b2e13dcd9b2f55af4e062ce70ad 100644 (file)
--- a/samples/opengl/cube/cube.cpp
+++ b/samples/opengl/cube/cube.cpp
@@ -32,7 +32,7 @@
 #include "cube.h"
 #include "../../sample.xpm"
 
 #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>
   #if defined(__WXMAC__) && !defined(__DARWIN__)
     #include <utime.h>
     #include <unistd.h>


@@ -136,7 +136,7 @@ int ScanCodeDialog::GetValue()
   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;
 


@@ -191,13 +191,13 @@ TestGLCanvas::TestGLCanvas(wxWindow *parent, wxWindowID id,
     m_rright = WXK_RIGHT;
 }
 
     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 )
     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_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_rleft = WXK_LEFT;
     m_rright = WXK_RIGHT;
 }


@@ -373,7 +373,7 @@ void TestGLCanvas::OnKeyDown( wxKeyEvent& event )
     {
         m_TimeInitialized = 1;
         m_xsynct = event.GetTimestamp();
     {
         m_TimeInitialized = 1;
         m_xsynct = event.GetTimestamp();

-        m_gsynct = wxStopWatch(&m_secbase);
+        m_gsynct = StopWatch(&m_secbase);

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


@@ -394,9 +394,9 @@ 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;    // StopWatch() doesn't work on Mac...

 #else
 #else

-        m_LastRedraw = wxStopWatch(&m_secbase) - m_gsynct;
+        m_LastRedraw = StopWatch(&m_secbase) - m_gsynct;

 #endif
         m_LastTime = currTime;
     }
 #endif
         m_LastTime = currTime;
     }