Fix handling of help buttons with non-empty label under OS X.

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

diff --git a/samples/opengl/isosurf/isosurf.h b/samples/opengl/isosurf/isosurf.h
index 6af9872cf547ec89f23e2faa8e4b01e5cd0b589f..75e6c48d528523be7cfd0a79bca8392515c7dd8e 100644 (file)
--- a/samples/opengl/isosurf/isosurf.h
+++ b/samples/opengl/isosurf/isosurf.h
@@ -47,10 +47,6 @@ class TestGLCanvas : public wxGLCanvas
 public:
     TestGLCanvas(wxWindow *parent,
                  wxWindowID id = wxID_ANY,
 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);
 
     virtual ~TestGLCanvas();
                  int *gl_attrib = NULL);
 
     virtual ~TestGLCanvas();


@@ -74,7 +70,7 @@ private:
     GLfloat m_xrot;
     GLfloat m_yrot;
 
     GLfloat m_xrot;
     GLfloat m_yrot;
 

-    DECLARE_NO_COPY_CLASS(TestGLCanvas)
+    wxDECLARE_NO_COPY_CLASS(TestGLCanvas);

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -85,8 +81,8 @@ class MyFrame : public wxFrame
 public:
     MyFrame(wxFrame *frame,
             const wxString& title,
 public:
     MyFrame(wxFrame *frame,
             const wxString& title,

-            const wxPoint& pos,
-            const wxSize& size,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,

             long style = wxDEFAULT_FRAME_STYLE);
 
     virtual ~MyFrame();
             long style = wxDEFAULT_FRAME_STYLE);
 
     virtual ~MyFrame();