X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1fc25a89ac1e6c5208db24bfc0abc8666b791dc6..94709f191133613e115fdbf913eba5a81ddd207e:/contrib/samples/ogl/studio/view.h?ds=sidebyside

diff --git a/contrib/samples/ogl/studio/view.h b/contrib/samples/ogl/studio/view.h
index 11cb3aeb1e..f7fc263d71 100644
--- a/contrib/samples/ogl/studio/view.h
+++ b/contrib/samples/ogl/studio/view.h
@@ -6,13 +6,13 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _STUDIO_VIEW_H_
 #define _STUDIO_VIEW_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 // #pragma interface "view.h"
 #endif
 
@@ -25,7 +25,7 @@ class csCanvas: public wxShapeCanvas
 DECLARE_CLASS(csCanvas)
  public:
 
-  csCanvas(csDiagramView *view, wxWindow *parent = NULL, wxWindowID id = -1,
+  csCanvas(csDiagramView *view, wxWindow *parent = NULL, wxWindowID id = wxID_ANY,
             const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
             long style = wxRETAINED);
   ~csCanvas(void);
@@ -65,7 +65,7 @@ class csDiagramView: public wxView
   bool OnCreate(wxDocument *doc, long flags);
   void OnDraw(wxDC *dc);
   void OnUpdate(wxView *sender, wxObject *hint = NULL);
-  bool OnClose(bool deleteWindow = TRUE);
+  bool OnClose(bool deleteWindow = true);
   void OnSelectAll(wxCommandEvent& event);
 
   wxShape *FindFirstSelectedShape(void);
@@ -95,7 +95,7 @@ class csDiagramView: public wxView
   void DoCmd(wxList& shapes, wxList& oldShapes, int cmd, const wxString& op);
 
   // Select or deselect all
-  void SelectAll(bool select = TRUE);
+  void SelectAll(bool select = true);
 
 // Event handlers
   void OnCut(wxCommandEvent& event);
@@ -132,7 +132,7 @@ class csDiagramView: public wxView
 DECLARE_EVENT_TABLE()
 
 public:
-  wxFrame*      frame;
+  wxMDIChildFrame*      frame;
   csCanvas*     canvas;
   wxList        m_selections;
 };