Fixes to allow compilation with no wchar_t (djgpp probably has a real wchar_t

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

diff --git a/samples/opengl/penguin/penguin.h b/samples/opengl/penguin/penguin.h
index 0020b657afe8c29b5511586c251da2f5fe89e4bb..dae7ca35e95afd4f4857b5418983d840e86fcd0c 100644 (file)
--- a/samples/opengl/penguin/penguin.h
+++ b/samples/opengl/penguin/penguin.h
@@ -20,16 +20,17 @@
 
 #include "wx/glcanvas.h"
 
 
 #include "wx/glcanvas.h"
 

-extern "C" {
+extern "C"
+{

 #include "lw.h"
 #include "trackball.h"
 }
 
 /* information needed to display lightwave mesh */
 #include "lw.h"
 #include "trackball.h"
 }
 
 /* information needed to display lightwave mesh */

-typedef struct 
+typedef struct

 {
 //  gint do_init;         /* true if initgl not yet called */
 {
 //  gint do_init;         /* true if initgl not yet called */

-    int do_init;
+    bool do_init;

     lwObject *lwobject;   /* lightwave object mesh */
     float beginx,beginy;  /* position of mouse */
     float quat[4];        /* orientation of object */
     lwObject *lwobject;   /* lightwave object mesh */
     float beginx,beginy;  /* position of mouse */
     float quat[4];        /* orientation of object */


@@ -41,7 +42,7 @@ typedef struct
 class MyApp: public wxApp
 {
 public:
 class MyApp: public wxApp
 {
 public:

-    bool OnInit(void);
+    bool OnInit();

 };
 
 /* Define a new frame type */
 };
 
 /* Define a new frame type */


@@ -50,17 +51,17 @@ class TestGLCanvas;
 class MyFrame: public wxFrame
 {
 public:
 class MyFrame: public wxFrame
 {
 public:

-    MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size,
-        long style = wxDEFAULT_FRAME_STYLE);
+    MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
+        const wxSize& size, long style = wxDEFAULT_FRAME_STYLE);

 
     void OnExit(wxCommandEvent& event);
 
     void OnExit(wxCommandEvent& event);

-    
+

 #if wxUSE_GLCANVAS
 #if wxUSE_GLCANVAS

-    void SetCanvas( TestGLCanvas *canvas )    { m_canvas = canvas; }
-    TestGLCanvas *GetCanvas()                 { return m_canvas; }
-    
+    void SetCanvas( TestGLCanvas *canvas ) { m_canvas = canvas; }
+    TestGLCanvas *GetCanvas() { return m_canvas; }
+

 private:
 private:

-    TestGLCanvas*    m_canvas;
+    TestGLCanvas *m_canvas;

 #endif
 
     DECLARE_EVENT_TABLE()
 #endif
 
     DECLARE_EVENT_TABLE()


@@ -71,17 +72,20 @@ private:
 class TestGLCanvas: public wxGLCanvas
 {
 public:
 class TestGLCanvas: public wxGLCanvas
 {
 public:

-    TestGLCanvas(wxWindow *parent, const wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("TestGLCanvas"));
-    ~TestGLCanvas(void);
+    TestGLCanvas(wxWindow *parent, wxWindowID id = wxID_ANY,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = 0,
+        const wxString& name = wxT("TestGLCanvas"));
+
+    ~TestGLCanvas();

 
     void OnPaint(wxPaintEvent& event);
     void OnSize(wxSizeEvent& event);
     void OnEraseBackground(wxEraseEvent& event);
     void LoadLWO( const wxString &filename);
     void OnMouse( wxMouseEvent& event );
 
     void OnPaint(wxPaintEvent& event);
     void OnSize(wxSizeEvent& event);
     void OnEraseBackground(wxEraseEvent& event);
     void LoadLWO( const wxString &filename);
     void OnMouse( wxMouseEvent& event );

-    void InitGL(void);
-   
+    void InitGL();
+

     mesh_info  info;
     bool       block;
 
     mesh_info  info;
     bool       block;
 


@@ -89,7 +93,7 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-#endif
+#endif // #if wxUSE_GLCANVAS

 
 

-#endif
+#endif // #ifndef _WX_PENGUIN_H_