removed src/gtk/eggtrayicon.h

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

diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp
index 41ef971a999ae673272a12ce3f9611dc3130dc21..425865f2802e853bd60d141e5b978bd96619ae78 100644 (file)
--- a/samples/opengl/cube/cube.cpp
+++ b/samples/opengl/cube/cube.cpp
@@ -25,6 +25,10 @@
 #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"
 
 #ifndef __WXMSW__     // for wxStopWatch, see remark below
 #include "cube.h"
 
 #ifndef __WXMSW__     // for wxStopWatch, see remark below


@@ -61,7 +65,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()
 };
 


@@ -162,8 +166,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)


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

-#endif // wxUSE_GLCANVAS
-

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


@@ -451,7 +451,7 @@ 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,
     if (isCloneWindow) str += wxT(" - Clone");
 
     MyFrame *frame = new MyFrame(NULL, str, wxDefaultPosition,


@@ -477,7 +477,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 +487,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 +501,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 +508,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 +519,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 +529,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
-

 }
 }