Wrap wxImage specifics in wxUSE_IMAGE and wxBitmap specifics in wxUSE_GUI.

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

diff --git a/samples/opengl/penguin/penguin.cpp b/samples/opengl/penguin/penguin.cpp
index 21e8b28c2531886841981a3d169fb80357b011cf..e991ad06ec5e75d59f120addc92170fff46644dd 100644 (file)
--- a/samples/opengl/penguin/penguin.cpp
+++ b/samples/opengl/penguin/penguin.cpp
@@ -25,6 +25,10 @@
 #include "wx/wx.h"
 #endif
 
+#if !wxUSE_GLCANVAS
+    #error "OpenGL required: set wxUSE_GLCANVAS to 1 and rebuild the library"
+#endif
+
 #include "penguin.h"
 #ifdef __WXMAC__
 #  ifdef __DARWIN__
@@ -43,7 +47,7 @@ bool MyApp::OnInit()
 {
 
     // Create the main frame window
-    MyFrame *frame = new MyFrame(NULL, wxT("wxWindows OpenGL Penguin Sample"),
+    MyFrame *frame = new MyFrame(NULL, wxT("wxWidgets OpenGL Penguin Sample"),
         wxDefaultPosition, wxDefaultSize);
 
     /* Make a menubar */
@@ -54,7 +58,6 @@ bool MyApp::OnInit()
     menuBar->Append(fileMenu, wxT("&File"));
     frame->SetMenuBar(menuBar);
 
-#if wxUSE_GLCANVAS
     frame->SetCanvas( new TestGLCanvas(frame, wxID_ANY, wxDefaultPosition,
         wxSize(200, 200), wxSUNKEN_BORDER) );
 
@@ -65,14 +68,6 @@ bool MyApp::OnInit()
     frame->Show(true);
 
     return true;
-#else
-
-    wxMessageBox( _T("This sample has to be compiled with wxUSE_GLCANVAS"),
-        _T("Building error"), wxOK);
-
-    return false;
-
-#endif
 }
 
 IMPLEMENT_APP(MyApp)
@@ -86,9 +81,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
     const wxSize& size, long style)
     : wxFrame(frame, wxID_ANY, title, pos, size, style)
 {
-#if wxUSE_GLCANVAS
     m_canvas = NULL;
-#endif
 }
 
 /* Intercept menu commands */
@@ -98,8 +91,6 @@ void MyFrame::OnExit( wxCommandEvent& WXUNUSED(event) )
     Close(true);
 }
 
-#if wxUSE_GLCANVAS
-
 BEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas)
     EVT_SIZE(TestGLCanvas::OnSize)
     EVT_PAINT(TestGLCanvas::OnPaint)
@@ -267,5 +258,3 @@ void TestGLCanvas::InitGL()
     glEnable(GL_COLOR_MATERIAL);
 }
 
-
-#endif // #if wxUSE_GLCANVAS