offset version by 1 to avoid having compatibility_version of 0.0.0 under Darwin:...

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

diff --git a/samples/opengl/penguin/penguin.cpp b/samples/opengl/penguin/penguin.cpp
index e991ad06ec5e75d59f120addc92170fff46644dd..93634a40600fc63c9595d17ba7dc2370ade3a32d 100644 (file)
--- a/samples/opengl/penguin/penguin.cpp
+++ b/samples/opengl/penguin/penguin.cpp
@@ -9,11 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation
-#pragma interface
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -40,12 +35,13 @@
 #  include <GL/glu.h>
 #endif
 
 #  include <GL/glu.h>
 #endif
 

+#include "../../sample.xpm"
+

 #define VIEW_ASPECT 1.3
 
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit()
 {
 #define VIEW_ASPECT 1.3
 
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit()
 {

-

     // Create the main frame window
     MyFrame *frame = new MyFrame(NULL, wxT("wxWidgets OpenGL Penguin Sample"),
         wxDefaultPosition, wxDefaultSize);
     // Create the main frame window
     MyFrame *frame = new MyFrame(NULL, wxT("wxWidgets OpenGL Penguin Sample"),
         wxDefaultPosition, wxDefaultSize);


@@ -82,6 +78,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
     : wxFrame(frame, wxID_ANY, title, pos, size, style)
 {
     m_canvas = NULL;
     : wxFrame(frame, wxID_ANY, title, pos, size, style)
 {
     m_canvas = NULL;

+    SetIcon(wxIcon(sample_xpm));

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


@@ -100,7 +97,7 @@ END_EVENT_TABLE()
 
 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, id, pos, size, style, name)
+    : wxGLCanvas(parent, id, pos, size, style|wxFULL_REPAINT_ON_RESIZE, name)

 {
     block = false;
 }
 {
     block = false;
 }