X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4fcf77bc06dde213daaafa76192904453ecdbd35..749a05ee85ea5453f155454e4640ebf795233ad3:/contrib/include/wx/ogl/canvas.h

diff --git a/contrib/include/wx/ogl/canvas.h b/contrib/include/wx/ogl/canvas.h
index 4990fe9447..b849048fad 100644
--- a/contrib/include/wx/ogl/canvas.h
+++ b/contrib/include/wx/ogl/canvas.h
@@ -6,16 +6,17 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGL_CANVAS_H_
 #define _OGL_CANVAS_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "canvas.h"
 #endif
 
+
 // Drag states
 #define NoDragging             0
 #define StartDraggingLeft      1
@@ -23,17 +24,17 @@
 #define StartDraggingRight     3
 #define ContinueDraggingRight  4
 
-extern wxChar* wxShapeCanvasNameStr;
+WXDLLIMPEXP_OGL extern const wxChar* wxShapeCanvasNameStr;
 
 // When drag_count reaches 0, process drag message
 
-class wxDiagram;
+class WXDLLIMPEXP_OGL wxDiagram;
 
-class wxShapeCanvas: public wxScrolledWindow
+class WXDLLIMPEXP_OGL wxShapeCanvas: public wxScrolledWindow
 {
  DECLARE_DYNAMIC_CLASS(wxShapeCanvas)
  public:
-  wxShapeCanvas(wxWindow *parent = NULL, wxWindowID id = -1,
+  wxShapeCanvas(wxWindow *parent = NULL, wxWindowID id = wxID_ANY,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxBORDER | wxRETAINED,