CodeWarrior dislikes #include <> syntax for in-tree headers, prefer ""

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

diff --git a/samples/opengl/penguin/penguin.h b/samples/opengl/penguin/penguin.h
index 1730b2130f0b538401c7ee2dcee0f1c81bb9b223..dae7ca35e95afd4f4857b5418983d840e86fcd0c 100644 (file)
--- a/samples/opengl/penguin/penguin.h
+++ b/samples/opengl/penguin/penguin.h
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PENGUIN_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PENGUIN_H_


@@ -20,20 +20,21 @@
 
 #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;
-  lwObject *lwobject;   /* lightwave object mesh */
-  float beginx,beginy;  /* position of mouse */
-  float quat[4];        /* orientation of object */
-  float zoom;           /* field of view in degrees */
+    bool do_init;
+    lwObject *lwobject;   /* lightwave object mesh */
+    float beginx,beginy;  /* position of mouse */
+    float quat[4];        /* orientation of object */
+    float zoom;           /* field of view in degrees */

 } mesh_info;
 
 
 } mesh_info;
 
 


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

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

 };
 
 /* Define a new frame type */
 class TestGLCanvas;
 };
 
 /* Define a new frame type */
 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);

-public:
-    TestGLCanvas*    m_canvas;

 
 

-DECLARE_EVENT_TABLE()
+#if wxUSE_GLCANVAS
+    void SetCanvas( TestGLCanvas *canvas ) { m_canvas = canvas; }
+    TestGLCanvas *GetCanvas() { return m_canvas; }
+
+private:
+    TestGLCanvas *m_canvas;
+#endif
+
+    DECLARE_EVENT_TABLE()

 };
 
 };
 

+#if wxUSE_GLCANVAS

 
 class TestGLCanvas: public wxGLCanvas
 {
 
 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 = "TestGLCanvas");
-   ~TestGLCanvas(void);
-
-   void OnPaint(wxPaintEvent& event);
-   void OnSize(wxSizeEvent& event);
-   void OnEraseBackground(wxEraseEvent& event);
-   void LoadLWO( const wxString &filename);
-   void OnMouse( wxMouseEvent& event );
-   void InitGL(void);
-   
-   mesh_info  info;
-   bool       block;
-
-DECLARE_EVENT_TABLE()
+public:
+    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 InitGL();
+
+    mesh_info  info;
+    bool       block;
+
+private:
+    DECLARE_EVENT_TABLE()

 };
 
 };
 

-#endif
+#endif // #if wxUSE_GLCANVAS
+
+#endif // #ifndef _WX_PENGUIN_H_