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 41ef971a999ae673272a12ce3f9611dc3130dc21..66bac043e0ea2b2e13dcd9b2f55af4e062ce70ad 100644 (file)
--- a/samples/opengl/cube/cube.cpp
+++ b/samples/opengl/cube/cube.cpp
@@ -25,9 +25,14 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

+#if !wxUSE_GLCANVAS
+    #error "OpenGL required: set wxUSE_GLCANVAS to 1 and rebuild the library"
+#endif
+

 #include "cube.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>
   #if defined(__WXMAC__) && !defined(__DARWIN__)
     #include <utime.h>
     #include <unistd.h>


@@ -61,7 +66,7 @@ public:
 
 private:
 
 
 private:
 

-    // Any class wishing to process wxWindows events must use this macro
+    // Any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -131,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;
 


@@ -162,8 +167,6 @@ unsigned long wxStopWatch( unsigned long *sec_base )
   Implementation of Test-GLCanvas
 -----------------------------------------------------------------*/
 
   Implementation of Test-GLCanvas
 -----------------------------------------------------------------*/
 

-#if wxUSE_GLCANVAS
-

 BEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas)
     EVT_SIZE(TestGLCanvas::OnSize)
     EVT_PAINT(TestGLCanvas::OnPaint)
 BEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas)
     EVT_SIZE(TestGLCanvas::OnSize)
     EVT_PAINT(TestGLCanvas::OnPaint)


@@ -180,7 +183,7 @@ unsigned long  TestGLCanvas::m_gsynct;
 
 TestGLCanvas::TestGLCanvas(wxWindow *parent, wxWindowID id,
     const wxPoint& pos, const wxSize& size, long style, const wxString& name)
 
 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 )
+    : wxGLCanvas(parent, (wxGLCanvas*) NULL, id, pos, size, style|wxFULL_REPAINT_ON_RESIZE , name )

 {
     m_init = false;
     m_gllist = 0;
 {
     m_init = false;
     m_gllist = 0;


@@ -188,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, 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;
 }


@@ -369,8 +372,8 @@ void TestGLCanvas::OnKeyDown( wxKeyEvent& event )
     if (!m_TimeInitialized)
     {
         m_TimeInitialized = 1;
     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;


@@ -378,7 +381,7 @@ 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)
     {
 
     if (evkey != m_Key)
     {


@@ -391,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;
     }


@@ -421,8 +424,6 @@ void TestGLCanvas::Rotate( GLfloat deg )
 }
 
 
 }
 
 

-#endif // wxUSE_GLCANVAS
-

 /* -----------------------------------------------------------------------
   Main Window
 -------------------------------------------------------------------------*/
 /* -----------------------------------------------------------------------
   Main Window
 -------------------------------------------------------------------------*/


@@ -440,6 +441,7 @@ MyFrame::MyFrame(wxWindow *parent, const wxString& title, const wxPoint& pos,
     : wxFrame(parent, wxID_ANY, title, pos, size, style)
 {
     m_canvas = NULL;
     : wxFrame(parent, wxID_ANY, title, pos, size, style)
 {
     m_canvas = NULL;

+    SetIcon(wxIcon(sample_xpm));

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


@@ -451,17 +453,12 @@ void MyFrame::OnExit( wxCommandEvent& WXUNUSED(event) )
 
 /*static*/ MyFrame *MyFrame::Create(MyFrame *parentFrame, bool isCloneWindow)
 {
 
 /*static*/ MyFrame *MyFrame::Create(MyFrame *parentFrame, bool isCloneWindow)
 {

-    wxString str = wxT("wxWindows OpenGL Cube Sample");
+    wxString str = wxT("wxWidgets OpenGL Cube Sample");

     if (isCloneWindow) str += wxT(" - Clone");
 
     MyFrame *frame = new MyFrame(NULL, str, wxDefaultPosition,
         wxSize(400, 300));
 
     if (isCloneWindow) str += wxT(" - Clone");
 
     MyFrame *frame = new MyFrame(NULL, str, wxDefaultPosition,
         wxSize(400, 300));
 

-    // Give it an icon
-#ifdef __WXMSW__
-    frame->SetIcon(wxIcon(_T("mondrian")));
-#endif
-

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


@@ -477,7 +474,6 @@ void MyFrame::OnExit( wxCommandEvent& WXUNUSED(event) )
 
     frame->SetMenuBar(menuBar);
 
 
     frame->SetMenuBar(menuBar);
 

-#if wxUSE_GLCANVAS

     if (parentFrame)
     {
         frame->m_canvas = new TestGLCanvas( frame, parentFrame->m_canvas,
     if (parentFrame)
     {
         frame->m_canvas = new TestGLCanvas( frame, parentFrame->m_canvas,


@@ -488,7 +484,6 @@ void MyFrame::OnExit( wxCommandEvent& WXUNUSED(event) )
         frame->m_canvas = new TestGLCanvas(frame, wxID_ANY,
             wxDefaultPosition, wxDefaultSize);
     }
         frame->m_canvas = new TestGLCanvas(frame, wxID_ANY,
             wxDefaultPosition, wxDefaultSize);
     }

-#endif

 
     // Show the frame
     frame->Show(true);
 
     // Show the frame
     frame->Show(true);


@@ -503,7 +498,6 @@ void MyFrame::OnNewWindow( wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnDefRotateLeftKey( wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::OnDefRotateLeftKey( wxCommandEvent& WXUNUSED(event) )
 {

-#if wxUSE_GLCANVAS

     ScanCodeDialog dial( this, wxID_ANY, m_canvas->m_rleft,
         wxString(_T("Left")), _T("Define key") );
 
     ScanCodeDialog dial( this, wxID_ANY, m_canvas->m_rleft,
         wxString(_T("Left")), _T("Define key") );
 


@@ -511,12 +505,10 @@ void MyFrame::OnDefRotateLeftKey( wxCommandEvent& WXUNUSED(event) )
 
     if( result == wxID_OK )
         m_canvas->m_rleft = dial.GetValue();
 
     if( result == wxID_OK )
         m_canvas->m_rleft = dial.GetValue();

-#endif

 }
 
 void MyFrame::OnDefRotateRightKey( wxCommandEvent& WXUNUSED(event) )
 {
 }
 
 void MyFrame::OnDefRotateRightKey( wxCommandEvent& WXUNUSED(event) )
 {

-#if wxUSE_GLCANVAS

     ScanCodeDialog dial( this, wxID_ANY, m_canvas->m_rright,
         wxString(_T("Right")), _T("Define key") );
 
     ScanCodeDialog dial( this, wxID_ANY, m_canvas->m_rright,
         wxString(_T("Right")), _T("Define key") );
 


@@ -524,7 +516,6 @@ void MyFrame::OnDefRotateRightKey( wxCommandEvent& WXUNUSED(event) )
 
     if( result == wxID_OK )
         m_canvas->m_rright = dial.GetValue();
 
     if( result == wxID_OK )
         m_canvas->m_rright = dial.GetValue();

-#endif

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


@@ -535,24 +526,8 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
 
 bool MyApp::OnInit()
 {

-#if wxUSE_LOG
-    wxLog::SetTraceMask(wxTraceMessages);
-#endif
-

     // Create the main frame window
     (void) MyFrame::Create(NULL);
 
     // Create the main frame window
     (void) MyFrame::Create(NULL);
 

-#if wxUSE_GLCANVAS
-

     return true;
     return true;

-
-#else
-
-    wxMessageBox( _T("This sample has to be compiled with wxUSE_GLCANVAS"),
-        _T("Building error"), wxOK);
-
-    return false;
-
-#endif
-

 }
 }