Sample update - wxTE_AUTO_URL from Mart R. [patch 1126182]

[wxWidgets.git] / contrib / samples / ogl / ogledit / view.h

diff --git a/contrib/samples/ogl/ogledit/view.h b/contrib/samples/ogl/ogledit/view.h
index 14985744473d699d195c1a2db729f7d25ea75014..f9c27952f3e0578ac923599d2d3009a294a1dba4 100644 (file)
--- 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
 // 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_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGLSAMPLE_VIEW_H_
 #define _OGLSAMPLE_VIEW_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 // #pragma interface "view.h"
 #endif
 
 // #pragma interface "view.h"
 #endif
 


@@ -26,7 +26,7 @@ class MyCanvas: public wxShapeCanvas
  public:
   wxView *view;
 
  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);
             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 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);
 
 
   wxShape *FindSelectedShape(void);