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

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

diff --git a/samples/opengl/isosurf/isosurf.h b/samples/opengl/isosurf/isosurf.h
index e84098c56b33a0c25f282322128464ca76e26257..cc85da042d1c2ff0a19c6f40e44c8e8f75a7c7a6 100644 (file)
--- a/samples/opengl/isosurf/isosurf.h
+++ b/samples/opengl/isosurf/isosurf.h
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ISOSURF_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ISOSURF_H_


@@ -14,39 +14,53 @@
 
 // Define a new application type
 class MyApp: public wxApp
 
 // Define a new application type
 class MyApp: public wxApp

-{ public:
-    bool OnInit(void);
+{
+public:
+    bool OnInit();

 };
 
 };
 

+#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",
-      int* gl_attrib = NULL);
-   ~TestGLCanvas(void);
-
-   void OnPaint(wxPaintEvent& event);
-   void OnSize(wxSizeEvent& event);
-   void OnEraseBackground(wxEraseEvent& event);
-   void OnChar(wxKeyEvent& event);
-   void OnMouseEvent(wxMouseEvent& event);
+public:
+    TestGLCanvas(wxWindow *parent, wxWindowID id = wxID_ANY,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = 0,
+        const wxString& name = _T("TestGLCanvas"), int *gl_attrib = NULL);

 
 

-DECLARE_EVENT_TABLE()
+   ~TestGLCanvas(){};
+
+    void OnPaint(wxPaintEvent& event);
+    void OnSize(wxSizeEvent& event);
+    void OnEraseBackground(wxEraseEvent& event);
+    void OnChar(wxKeyEvent& event);
+    void OnMouseEvent(wxMouseEvent& event);
+
+    DECLARE_EVENT_TABLE()

 };
 
 };
 

+#endif // #if wxUSE_GLCANVAS
+
+

 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);
+
+    virtual ~MyFrame();
+
+#if wxUSE_GLCANVAS
+    TestGLCanvas *m_canvas;
+#endif
+
+private :

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

-public:
-    TestGLCanvas*    m_canvas;

 
 DECLARE_EVENT_TABLE()
 };
 
 
 DECLARE_EVENT_TABLE()
 };
 

-#endif
+#endif // #ifndef _WX_ISOSURF_H_