Doesn't conform to license conditions, so removing

[wxWidgets.git] / contrib / include / wx / ogl / canvas.h

diff --git a/contrib/include/wx/ogl/canvas.h b/contrib/include/wx/ogl/canvas.h
index faeaaa30adc744256da0fb2f918d30c7e002edd0..b849048fad482ac20069b5bbd4fabe92d9af6033 100644 (file)
--- 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
 // 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_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGL_CANVAS_H_
 #define _OGL_CANVAS_H_
 

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

 #pragma interface "canvas.h"
 #endif
 
 #pragma interface "canvas.h"
 #endif
 

+

 // Drag states
 #define NoDragging             0
 #define StartDraggingLeft      1
 // Drag states
 #define NoDragging             0
 #define StartDraggingLeft      1


@@ -23,16 +24,21 @@
 #define StartDraggingRight     3
 #define ContinueDraggingRight  4
 
 #define StartDraggingRight     3
 #define ContinueDraggingRight  4
 

+WXDLLIMPEXP_OGL extern const wxChar* wxShapeCanvasNameStr;
+

 // When drag_count reaches 0, process drag message
 
 // 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:
 {
  DECLARE_DYNAMIC_CLASS(wxShapeCanvas)
  public:

-  wxShapeCanvas(wxWindow *parent = NULL, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-               long style = wxBORDER | wxRETAINED);
+  wxShapeCanvas(wxWindow *parent = NULL, wxWindowID id = wxID_ANY,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxBORDER | wxRETAINED,
+                const wxString& name = wxShapeCanvasNameStr);

   ~wxShapeCanvas();
 
   inline void SetDiagram(wxDiagram *diag) { m_shapeDiagram = diag; }
   ~wxShapeCanvas();
 
   inline void SetDiagram(wxDiagram *diag) { m_shapeDiagram = diag; }


@@ -54,7 +60,7 @@ class wxShapeCanvas: public wxScrolledWindow
   virtual wxShape *FindShape(double x, double y, int *attachment, wxClassInfo *info = NULL, wxShape *notImage = NULL);
   wxShape *FindFirstSensitiveShape(double x, double y, int *new_attachment, int op);
   wxShape *FindFirstSensitiveShape1(wxShape *image, int op);
   virtual wxShape *FindShape(double x, double y, int *attachment, wxClassInfo *info = NULL, wxShape *notImage = NULL);
   wxShape *FindFirstSensitiveShape(double x, double y, int *new_attachment, int op);
   wxShape *FindFirstSensitiveShape1(wxShape *image, int op);

-  
+

   // Redirect to wxDiagram object
   virtual void AddShape(wxShape *object, wxShape *addAfter = NULL);
   virtual void InsertShape(wxShape *object);
   // Redirect to wxDiagram object
   virtual void AddShape(wxShape *object, wxShape *addAfter = NULL);
   virtual void InsertShape(wxShape *object);