Added Net library to contrib

[wxWidgets.git] / wxPython / contrib / ogl / oglhelpers.h

diff --git a/wxPython/contrib/ogl/oglhelpers.h b/wxPython/contrib/ogl/oglhelpers.h
index a24ce863b35deb38a5e96617f15d0450f5af3243..532e7d68e4d6103d65bc7da883bafb9f8b9dd893 100644 (file)
--- a/wxPython/contrib/ogl/oglhelpers.h
+++ b/wxPython/contrib/ogl/oglhelpers.h
@@ -108,10 +108,11 @@ wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList);
 // virtual callbacks into Python callbacks.
 
 class wxPyShapeCanvas : public wxShapeCanvas {
 // virtual callbacks into Python callbacks.
 
 class wxPyShapeCanvas : public wxShapeCanvas {

+    DECLARE_DYNAMIC_CLASS(wxPyShapeCanvas);

 public:
     wxPyShapeCanvas(wxWindow* parent = NULL, wxWindowID id = -1,
 public:
     wxPyShapeCanvas(wxWindow* parent = NULL, wxWindowID id = -1,

-                    const wxPoint& pos = wxPyDefaultPosition,
-                    const wxSize& size = wxPyDefaultSize,
+                    const wxPoint& pos = wxDefaultPosition,
+                    const wxSize& size = wxDefaultSize,

                     long style = wxBORDER)
         : wxShapeCanvas(parent, id, pos, size, style) {}
 
                     long style = wxBORDER)
         : wxShapeCanvas(parent, id, pos, size, style) {}
 


@@ -130,6 +131,7 @@ public:
 
 
 class wxPyShapeEvtHandler : public wxShapeEvtHandler {
 
 
 class wxPyShapeEvtHandler : public wxShapeEvtHandler {

+    DECLARE_DYNAMIC_CLASS(wxPyShapeEvtHandler);

 public:
     wxPyShapeEvtHandler(wxShapeEvtHandler *prev = NULL, wxShape *shape = NULL)
         : wxShapeEvtHandler(prev, shape) {}
 public:
     wxPyShapeEvtHandler(wxShapeEvtHandler *prev = NULL, wxShape *shape = NULL)
         : wxShapeEvtHandler(prev, shape) {}


@@ -139,6 +141,7 @@ public:
 
 
 class wxPyShape : public wxShape {
 
 
 class wxPyShape : public wxShape {

+    DECLARE_ABSTRACT_CLASS(wxPyShape);

 public:
     wxPyShape(wxPyShapeCanvas *can = NULL)
         : wxShape(can) {}
 public:
     wxPyShape(wxPyShapeCanvas *can = NULL)
         : wxShape(can) {}


@@ -149,6 +152,7 @@ public:
 
 
 class wxPyRectangleShape : public wxRectangleShape {
 
 
 class wxPyRectangleShape : public wxRectangleShape {

+    DECLARE_DYNAMIC_CLASS(wxPyRectangleShape);

 public:
     wxPyRectangleShape(double width = 0.0, double height = 0.0)
         : wxRectangleShape(width, height) {}
 public:
     wxPyRectangleShape(double width = 0.0, double height = 0.0)
         : wxRectangleShape(width, height) {}


@@ -157,6 +161,7 @@ public:
 };
 
 class wxPyControlPoint : public wxControlPoint {
 };
 
 class wxPyControlPoint : public wxControlPoint {

+    DECLARE_DYNAMIC_CLASS(wxPyControlPoint);

 public:
     wxPyControlPoint(wxPyShapeCanvas *the_canvas = NULL,
                      wxPyShape *object = NULL,
 public:
     wxPyControlPoint(wxPyShapeCanvas *the_canvas = NULL,
                      wxPyShape *object = NULL,


@@ -171,6 +176,7 @@ public:
 
 
 class wxPyBitmapShape : public wxBitmapShape {
 
 
 class wxPyBitmapShape : public wxBitmapShape {

+    DECLARE_DYNAMIC_CLASS(wxPyBitmapShape);

 public:
     wxPyBitmapShape() : wxBitmapShape() {}
 
 public:
     wxPyBitmapShape() : wxBitmapShape() {}
 


@@ -180,6 +186,7 @@ public:
 
 
 class wxPyDrawnShape : public wxDrawnShape {
 
 
 class wxPyDrawnShape : public wxDrawnShape {

+    DECLARE_DYNAMIC_CLASS(wxPyDrawnShape);

 public:
     wxPyDrawnShape() : wxDrawnShape() {}
 
 public:
     wxPyDrawnShape() : wxDrawnShape() {}
 


@@ -188,6 +195,7 @@ public:
 
 
 class wxPyCompositeShape : public wxCompositeShape {
 
 
 class wxPyCompositeShape : public wxCompositeShape {

+    DECLARE_DYNAMIC_CLASS(wxPyCompositeShape);

 public:
     wxPyCompositeShape() : wxCompositeShape() {}
 
 public:
     wxPyCompositeShape() : wxCompositeShape() {}
 


@@ -196,6 +204,7 @@ public:
 
 
 class wxPyDividedShape : public wxDividedShape {
 
 
 class wxPyDividedShape : public wxDividedShape {

+    DECLARE_DYNAMIC_CLASS(wxPyDividedShape);

 public:
     wxPyDividedShape(double width = 0.0, double height = 0.0)
         : wxDividedShape(width, height) {}
 public:
     wxPyDividedShape(double width = 0.0, double height = 0.0)
         : wxDividedShape(width, height) {}


@@ -205,6 +214,7 @@ public:
 
 
 class wxPyDivisionShape : public wxDivisionShape {
 
 
 class wxPyDivisionShape : public wxDivisionShape {

+    DECLARE_DYNAMIC_CLASS(wxPyDivisionShape);

 public:
     wxPyDivisionShape() : wxDivisionShape() {}
 
 public:
     wxPyDivisionShape() : wxDivisionShape() {}
 


@@ -213,6 +223,7 @@ public:
 
 
 class wxPyEllipseShape : public wxEllipseShape {
 
 
 class wxPyEllipseShape : public wxEllipseShape {

+    DECLARE_DYNAMIC_CLASS(wxPyEllipseShape);

 public:
     wxPyEllipseShape(double width = 0.0, double height = 0.0)
         : wxEllipseShape(width, height) {}
 public:
     wxPyEllipseShape(double width = 0.0, double height = 0.0)
         : wxEllipseShape(width, height) {}


@@ -222,6 +233,7 @@ public:
 
 
 class wxPyCircleShape : public wxCircleShape {
 
 
 class wxPyCircleShape : public wxCircleShape {

+    DECLARE_DYNAMIC_CLASS(wxPyCircleShape);

 public:
     wxPyCircleShape(double width = 0.0)
         : wxCircleShape(width) {}
 public:
     wxPyCircleShape(double width = 0.0)
         : wxCircleShape(width) {}


@@ -231,6 +243,7 @@ public:
 
 
 class wxPyLineShape : public wxLineShape {
 
 
 class wxPyLineShape : public wxLineShape {

+    DECLARE_DYNAMIC_CLASS(wxPyLineShape);

 public:
     wxPyLineShape() : wxLineShape() {}
 
 public:
     wxPyLineShape() : wxLineShape() {}
 


@@ -239,6 +252,7 @@ public:
 
 
 class wxPyPolygonShape : public wxPolygonShape {
 
 
 class wxPyPolygonShape : public wxPolygonShape {

+    DECLARE_DYNAMIC_CLASS(wxPyPolygonShape);

 public:
     wxPyPolygonShape() : wxPolygonShape() {}
 
 public:
     wxPyPolygonShape() : wxPolygonShape() {}
 


@@ -247,6 +261,7 @@ public:
 
 
 class wxPyTextShape : public wxTextShape {
 
 
 class wxPyTextShape : public wxTextShape {

+    DECLARE_DYNAMIC_CLASS(wxPyTextShape);

 public:
     wxPyTextShape(double width = 0.0, double height = 0.0)
         : wxTextShape(width, height) {}
 public:
     wxPyTextShape(double width = 0.0, double height = 0.0)
         : wxTextShape(width, height) {}


@@ -260,3 +275,4 @@ public:
 //---------------------------------------------------------------------------
 #endif
 
 //---------------------------------------------------------------------------
 #endif
 

+