X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1fc25a89ac1e6c5208db24bfc0abc8666b791dc6..d391f6679dc29d7c76e4401aa2cc01ed013651e1:/contrib/samples/ogl/ogledit/view.h?ds=sidebyside diff --git a/contrib/samples/ogl/ogledit/view.h b/contrib/samples/ogl/ogledit/view.h index 1498574447..f9c27952f3 100644 --- a/contrib/samples/ogl/ogledit/view.h +++ b/contrib/samples/ogl/ogledit/view.h @@ -6,13 +6,13 @@ // Created: 12/07/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _OGLSAMPLE_VIEW_H_ #define _OGLSAMPLE_VIEW_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) // #pragma interface "view.h" #endif @@ -26,7 +26,7 @@ class MyCanvas: public wxShapeCanvas public: wxView *view; - MyCanvas(wxView *view, wxWindow *parent = NULL, wxWindowID id = -1, + MyCanvas(wxView *view, wxWindow *parent = NULL, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxRETAINED); ~MyCanvas(void); @@ -62,7 +62,7 @@ class DiagramView: 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); wxShape *FindSelectedShape(void);