Moved and reorganized wxPython directories

Now builds into an intermediate wxPython package directory before
installing


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/contrib/.cvsignore

@@ -0,0 +1 @@
+update.log

wxPython/contrib/README

@@ -0,0 +1,3 @@
+These sub directories contain add-on modules that are not part of the
+core wxPython, either because of licensing issues, optional code in
+wxWindows, contrib code in wxWindows, or whatever.

wxPython/contrib/buildall.py

@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+#----------------------------------------------------------------------------
+# Name:         buildall.py
+# Purpose:	Invokes the build script for all modules defined in
+#               MODULELIST
+#
+# Author:       Robin Dunn
+#
+# Created:      18-Aug-1999
+# RCS-ID:       $Id$
+# Copyright:    (c) 1999 by Total Control Software
+# Licence:      wxWindows license
+#----------------------------------------------------------------------------
+
+import sys, os
+sys.path.insert(0, '../distrib')
+import build
+
+MODULELIST = ['glcanvas', 'ogl', 'stc', ]
+
+
+
+for module in MODULELIST:
+    cwd = os.getcwd()
+    print "**** Building %s ****" % module
+    err = build.main(['../../distrib/build.py', '-C', module] + sys.argv[1:])
+    os.chdir(cwd)
+    if err:
+        break
+
+sys.exit(err)

wxPython/contrib/glcanvas/.cvsignore

@@ -0,0 +1,14 @@
+
+*.exp
+*.lib
+*.obj
+*.pch
+Makefile
+Makefile.pre
+Setup
+build.local
+config.c
+glcanvas.h
+glcanvasc.ilk
+glcanvasc.pyd
+sedscript

wxPython/contrib/glcanvas/build.cfg

@@ -0,0 +1,24 @@
+# -*- python -*-
+import sys
+
+MODULE = 'glcanvasc'
+SWIGFILES = ['glcanvas.i', ]
+
+
+if sys.platform == 'win32':
+#    SOURCES = ['_glcanvas.cpp']
+#    OTHERLIBS = 'glu32.lib opengl32.lib'
+#    OTHERCFLAGS = '-DwxUSE_GLCANVAS=1'
+#    OTHERRULES = '''
+#_glcanvas.cpp : $(WXDIR)\src\msw\glcanvas.cpp
+#	copy $(WXDIR)\src\msw\glcanvas.cpp _glcanvas.cpp
+#'''
+    pass
+
+else:
+
+    print "Warning: Assuming MesaGL libraries. Override OTHERLIBS in build.local\n"\
+          "         if you have native GL!"
+    OTHERLIBS = "-lwx_gtk_gl -lMesaGL -lMesaGLU"
+
+

wxPython/contrib/glcanvas/glcanvas.i

@@ -0,0 +1,108 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        glcanvas.i
+// Purpose:     SWIG definitions for the OpenGL wxWindows classes
+//
+// Author:      Robin Dunn
+//
+// Created:     15-Mar-1999
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 by Total Control Software
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+
+%module glcanvas
+
+%{
+#include "helpers.h"
+#include <wx/glcanvas.h>
+%}
+
+//---------------------------------------------------------------------------
+
+%include typemaps.i
+%include my_typemaps.i
+
+%extern wx.i
+%extern windows.i
+%extern windows2.i
+%extern windows3.i
+%extern frames.i
+%extern _defs.i
+%extern misc.i
+%extern gdi.i
+%extern controls.i
+%extern events.i
+
+
+%{
+#if defined(__WXMSW__)
+    static wxString wxPyEmptyStr("");
+    static wxPoint  wxPyDefaultPosition(-1, -1);
+    static wxSize   wxPyDefaultSize(-1, -1);
+#endif
+%}
+
+%pragma(python) code = "import wx"
+
+//---------------------------------------------------------------------------
+
+class wxPalette;
+class wxWindow;
+class wxSize;
+class wxPoint;
+class wxGLCanvas;
+
+//---------------------------------------------------------------------------
+
+class wxGLContext {
+public:
+    wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette = wxNullPalette);
+    ~wxGLContext();
+
+    void SetCurrent();
+    void SetColour(const char *colour);
+    void SwapBuffers();
+
+#ifdef __WXGTK__
+    void SetupPixelFormat();
+    void SetupPalette(const wxPalette& palette);
+    wxPalette CreateDefaultPalette();
+    wxPalette* GetPalette();
+#endif
+
+    wxWindow* GetWindow();
+};
+
+//---------------------------------------------------------------------------
+
+class wxGLCanvas : public wxScrolledWindow {
+public:
+    wxGLCanvas(wxWindow *parent, wxWindowID id = -1,
+               const wxPoint& pos = wxPyDefaultPosition,
+               const wxSize& size = wxPyDefaultSize, long style = 0,
+               const char* name = "GLCanvas",
+               int *attribList = 0,
+               const wxPalette& palette = wxNullPalette);
+
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+
+    void SetCurrent();
+    void SetColour(const char *colour);
+    void SwapBuffers();
+
+    wxGLContext* GetContext();
+};
+
+
+//---------------------------------------------------------------------------
+
+%init %{
+
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();
+
+%}
+
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------

wxPython/contrib/glcanvas/glcanvasc.def

@@ -0,0 +1,2 @@
+EXPORTS
+  initglcanvasc

wxPython/contrib/glcanvas/gtk/.cvsignore

@@ -0,0 +1,2 @@
+*~
+_glcanvas.cpp

wxPython/contrib/glcanvas/gtk/glcanvas.py

@@ -0,0 +1,117 @@
+# This file was created automatically by SWIG.
+import glcanvasc
+
+from misc import *
+
+from misc2 import *
+
+from windows import *
+
+from gdi import *
+
+from clip_dnd import *
+
+from events import *
+
+from mdi import *
+
+from frames import *
+
+from stattool import *
+
+from controls import *
+
+from controls2 import *
+
+from windows2 import *
+
+from cmndlgs import *
+
+from windows3 import *
+
+from image import *
+
+from printfw import *
+
+from sizers import *
+import wx
+class wxGLContextPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,glcanvasc=glcanvasc):
+        if self.thisown == 1 :
+            glcanvasc.delete_wxGLContext(self)
+    def SetCurrent(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLContext_SetCurrent,(self,) + _args, _kwargs)
+        return val
+    def SetColour(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLContext_SetColour,(self,) + _args, _kwargs)
+        return val
+    def SwapBuffers(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLContext_SwapBuffers,(self,) + _args, _kwargs)
+        return val
+    def SetupPixelFormat(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLContext_SetupPixelFormat,(self,) + _args, _kwargs)
+        return val
+    def SetupPalette(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLContext_SetupPalette,(self,) + _args, _kwargs)
+        return val
+    def CreateDefaultPalette(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLContext_CreateDefaultPalette,(self,) + _args, _kwargs)
+        if val: val = wxPalettePtr(val) ; val.thisown = 1
+        return val
+    def GetPalette(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLContext_GetPalette,(self,) + _args, _kwargs)
+        if val: val = wxPalettePtr(val) 
+        return val
+    def GetWindow(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLContext_GetWindow,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 
+        return val
+    def __repr__(self):
+        return "<C wxGLContext instance at %s>" % (self.this,)
+class wxGLContext(wxGLContextPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(glcanvasc.new_wxGLContext,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxGLCanvasPtr(wxScrolledWindowPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def SetCurrent(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLCanvas_SetCurrent,(self,) + _args, _kwargs)
+        return val
+    def SetColour(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLCanvas_SetColour,(self,) + _args, _kwargs)
+        return val
+    def SwapBuffers(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLCanvas_SwapBuffers,(self,) + _args, _kwargs)
+        return val
+    def GetContext(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLCanvas_GetContext,(self,) + _args, _kwargs)
+        if val: val = wxGLContextPtr(val) 
+        return val
+    def __repr__(self):
+        return "<C wxGLCanvas instance at %s>" % (self.this,)
+class wxGLCanvas(wxGLCanvasPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(glcanvasc.new_wxGLCanvas,_args,_kwargs)
+        self.thisown = 1
+        wx._StdWindowCallbacks(self)
+
+
+
+
+
+
+#-------------- FUNCTION WRAPPERS ------------------
+
+
+
+#-------------- VARIABLE WRAPPERS ------------------
+

wxPython/contrib/glcanvas/msw/.cvsignore

@@ -0,0 +1 @@
+*~

wxPython/contrib/glcanvas/msw/glcanvas.py

@@ -0,0 +1,103 @@
+# This file was created automatically by SWIG.
+import glcanvasc
+
+from misc import *
+
+from misc2 import *
+
+from windows import *
+
+from gdi import *
+
+from clip_dnd import *
+
+from events import *
+
+from mdi import *
+
+from frames import *
+
+from stattool import *
+
+from controls import *
+
+from controls2 import *
+
+from windows2 import *
+
+from cmndlgs import *
+
+from windows3 import *
+
+from image import *
+
+from printfw import *
+
+from sizers import *
+import wx
+class wxGLContextPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,glcanvasc=glcanvasc):
+        if self.thisown == 1 :
+            glcanvasc.delete_wxGLContext(self)
+    def SetCurrent(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLContext_SetCurrent,(self,) + _args, _kwargs)
+        return val
+    def SetColour(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLContext_SetColour,(self,) + _args, _kwargs)
+        return val
+    def SwapBuffers(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLContext_SwapBuffers,(self,) + _args, _kwargs)
+        return val
+    def GetWindow(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLContext_GetWindow,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 
+        return val
+    def __repr__(self):
+        return "<C wxGLContext instance at %s>" % (self.this,)
+class wxGLContext(wxGLContextPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(glcanvasc.new_wxGLContext,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxGLCanvasPtr(wxScrolledWindowPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def SetCurrent(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLCanvas_SetCurrent,(self,) + _args, _kwargs)
+        return val
+    def SetColour(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLCanvas_SetColour,(self,) + _args, _kwargs)
+        return val
+    def SwapBuffers(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLCanvas_SwapBuffers,(self,) + _args, _kwargs)
+        return val
+    def GetContext(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLCanvas_GetContext,(self,) + _args, _kwargs)
+        if val: val = wxGLContextPtr(val) 
+        return val
+    def __repr__(self):
+        return "<C wxGLCanvas instance at %s>" % (self.this,)
+class wxGLCanvas(wxGLCanvasPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(glcanvasc.new_wxGLCanvas,_args,_kwargs)
+        self.thisown = 1
+        wx._StdWindowCallbacks(self)
+
+
+
+
+
+
+#-------------- FUNCTION WRAPPERS ------------------
+
+
+
+#-------------- VARIABLE WRAPPERS ------------------
+

wxPython/contrib/ogl/.cvsignore

@@ -0,0 +1,5 @@
+Makefile
+oglc.exp
+oglc.ilk
+oglc.pch
+oglc.pyd

wxPython/contrib/ogl/README.txt

@@ -0,0 +1,7 @@
+Since OGL is not always bundled with distributions of wxWindows, in
+order for it to be a standard part of wxPython I need to bundle it
+here.  The contents of the contrib directory are copies of the
+relevant parts of the main contrib directory in wxWindows.  The
+build.py script in this directory will also build the needed files
+from there, so you no longer have to worry about aquiring and building
+additional libraries beyond wxWindows itself.

wxPython/contrib/ogl/_extras.py

@@ -0,0 +1,36 @@
+
+wxShapeCanvas =       wxPyShapeCanvas
+wxShapeEvtHandler =   wxPyShapeEvtHandler
+wxShape =             wxPyShape
+wxRectangleShape =    wxPyRectangleShape
+wxBitmapShape =       wxPyBitmapShape
+wxDrawnShape =        wxPyDrawnShape
+wxCompositeShape =    wxPyCompositeShape
+wxDividedShape =      wxPyDividedShape
+wxDivisionShape =     wxPyDivisionShape
+wxEllipseShape =      wxPyEllipseShape
+wxCircleShape =       wxPyCircleShape
+wxLineShape =         wxPyLineShape
+wxPolygonShape =      wxPyPolygonShape
+wxTextShape =         wxPyTextShape
+wxControlPoint =      wxPyControlPoint
+
+# Stuff these names into the wx namespace so wxPyConstructObject can find them
+import wx
+wx.wxPyShapeCanvasPtr     = wxPyShapeCanvasPtr
+wx.wxPyShapeEvtHandlerPtr = wxPyShapeEvtHandlerPtr
+wx.wxPyShapePtr           = wxPyShapePtr
+wx.wxPyRectangleShapePtr  = wxPyRectangleShapePtr
+wx.wxPyBitmapShapePtr     = wxPyBitmapShapePtr
+wx.wxPyDrawnShapePtr      = wxPyDrawnShapePtr
+wx.wxPyCompositeShapePtr  = wxPyCompositeShapePtr
+wx.wxPyDividedShapePtr    = wxPyDividedShapePtr
+wx.wxPyDivisionShapePtr   = wxPyDivisionShapePtr
+wx.wxPyEllipseShapePtr    = wxPyEllipseShapePtr
+wx.wxPyCircleShapePtr     = wxPyCircleShapePtr
+wx.wxPyLineShapePtr       = wxPyLineShapePtr
+wx.wxPyPolygonShapePtr    = wxPyPolygonShapePtr
+wx.wxPyTextShapePtr       = wxPyTextShapePtr
+wx.wxShapeRegionPtr       = wxShapeRegionPtr
+wx.wxOGLConstraintPtr     = wxOGLConstraintPtr
+wx.wxControlPointPtr      = wxPyControlPointPtr

wxPython/contrib/ogl/_ogldefs.i

@@ -0,0 +1,63 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        _ogldefs.i
+// Purpose:     SWIG definitions for the wxWindows Object Graphics Library
+//
+// Author:      Robin Dunn
+//
+// Created:     27-Aug-1999
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 by Total Control Software
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+
+//---------------------------------------------------------------------------
+
+
+class wxOGLConstraint;
+class wxBitmapShape;
+class wxDiagram;
+class wxDrawnShape;
+class wxCircleShape;
+class wxCompositeShape;
+class wxDividedShape;
+class wxDivisionShape;
+class wxEllipseShape;
+class wxLineShape;
+class wxPolygonShape;
+class wxRectangleShape;
+class wxPseudoMetaFile;
+class wxShape;
+class wxShapeCanvas;
+class wxShapeEvtHandler;
+class wxTextShape;
+class wxControlPoint;
+
+class wxPyOGLConstraint;
+class wxPyBitmapShape;
+class wxPyDiagram;
+class wxPyDrawnShape;
+class wxPyCircleShape;
+class wxPyCompositeShape;
+class wxPyDividedShape;
+class wxPyDivisionShape;
+class wxPyEllipseShape;
+class wxPyLineShape;
+class wxPyPolygonShape;
+class wxPyRectangleShape;
+class wxPyPseudoMetaFile;
+class wxPyShape;
+class wxPyShapeCanvas;
+class wxPyShapeEvtHandler;
+class wxPyTextShape;
+class wxPyControlPoint;
+
+
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+
+
+
+
+

wxPython/contrib/ogl/build.cfg

@@ -0,0 +1,52 @@
+# -*- python -*-
+import sys
+
+MODULE = 'oglc'
+SWIGFILES = ['ogl.i', 'oglbasic.i', 'oglshapes.i', 'oglshapes2.i', 'oglcanvas.i']
+SOURCES = ['oglhelpers.cpp']
+
+
+OTHERCFLAGS = '-I$(STCLOC)/contrib/include'
+SOURCES = SOURCES + [
+    '$(STCLOC)/contrib/src/ogl/basic.cpp',
+    '$(STCLOC)/contrib/src/ogl/bmpshape.cpp',
+    '$(STCLOC)/contrib/src/ogl/composit.cpp',
+    '$(STCLOC)/contrib/src/ogl/divided.cpp',
+    '$(STCLOC)/contrib/src/ogl/lines.cpp',
+    '$(STCLOC)/contrib/src/ogl/misc.cpp',
+    '$(STCLOC)/contrib/src/ogl/basic2.cpp',
+    '$(STCLOC)/contrib/src/ogl/canvas.cpp',
+    '$(STCLOC)/contrib/src/ogl/constrnt.cpp',
+    '$(STCLOC)/contrib/src/ogl/drawn.cpp',
+    '$(STCLOC)/contrib/src/ogl/mfutils.cpp',
+    '$(STCLOC)/contrib/src/ogl/ogldiag.cpp',
+    ]
+
+if sys.platform == 'win32':
+    OTHERDEFS = 'STCLOC = $(WXWIN)'
+    OTHERRULES = '''
+{$(WXWIN)/contrib/src/ogl}.cpp{}.obj:
+	$(cc) @<<
+$(CPPFLAGS) /c /Tp $<
+<<
+'''
+else:
+    OTHERCFLAGS = '-Icontrib/include'
+    DEFAULTRULE = 'default: contrib $(GENCODEDIR) $(TARGET)'
+    OTHERRULES = """
+%.o : contrib/src/ogl/%.cpp
+	$(CCC) $(CCSHARED) $(CFLAGS) $(OTHERCFLAGS) -c $<
+
+contrib :
+	ln -s $(WXWIN)/contrib contrib
+
+"""
+
+
+SWIGDEPS = '_ogldefs.i'
+OTHERDEPS = 'oglhelpers.h $(WXPSRCDIR)/helpers.h'
+
+
+# There are no platform differences so we don't need separate code directories
+GENCODEDIR='.'
+SWIGTOOLKITFLAG=''

wxPython/contrib/ogl/ogl.cpp

@@ -0,0 +1,718 @@
+/*
+ * FILE : ./ogl.cpp
+ * 
+ * This file was automatically generated by :
+ * Simplified Wrapper and Interface Generator (SWIG)
+ * Version 1.1 (Build 810)
+ * 
+ * Portions Copyright (c) 1995-1998
+ * The University of Utah and The Regents of the University of California.
+ * Permission is granted to distribute this file in any manner provided
+ * this notice remains intact.
+ * 
+ * Do not make changes to this file--changes will be lost!
+ *
+ */
+
+
+#define SWIGCODE
+/* Implementation : PYTHON */
+
+#define SWIGPYTHON
+#include <string.h>
+#include <stdlib.h>
+/* Definitions for Windows/Unix exporting */
+#if defined(__WIN32__)
+#   if defined(_MSC_VER)
+#	define SWIGEXPORT(a) __declspec(dllexport) a
+#   else
+#	if defined(__BORLANDC__)
+#	    define SWIGEXPORT(a) a _export 
+#	else
+#	    define SWIGEXPORT(a) a 
+#	endif
+#   endif
+#else
+#   define SWIGEXPORT(a) a 
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include "Python.h"
+extern void SWIG_MakePtr(char *, void *, char *);
+extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
+extern char *SWIG_GetPtr(char *, void **, char *);
+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);
+extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
+extern PyObject *SWIG_newvarlink(void);
+#ifdef __cplusplus
+}
+#endif
+#define SWIG_init    initoglc
+
+#define SWIG_name    "oglc"
+
+#include "helpers.h"
+#include "oglhelpers.h"
+
+static PyObject* l_output_helper(PyObject* target, PyObject* o) {
+    PyObject*   o2;
+    PyObject*   o3;
+    if (!target) {                   
+        target = o;
+    } else if (target == Py_None) {  
+        Py_DECREF(Py_None);
+        target = o;
+    } else {                         
+        if (!PyList_Check(target)) {
+            o2 = target;
+            target = PyList_New(0);
+            PyList_Append(target, o2);
+	    Py_XDECREF(o2);
+        }
+        PyList_Append(target,o);
+	Py_XDECREF(o);
+    }
+    return target;
+}
+
+static PyObject* t_output_helper(PyObject* target, PyObject* o) {
+    PyObject*   o2;
+    PyObject*   o3;
+
+    if (!target) {                   
+        target = o;
+    } else if (target == Py_None) {  
+        Py_DECREF(Py_None);
+        target = o;
+    } else {                         
+        if (!PyTuple_Check(target)) {
+            o2 = target;
+            target = PyTuple_New(1);
+            PyTuple_SetItem(target, 0, o2);
+        }
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      
+
+        o2 = target;
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      
+        Py_DECREF(o3);
+    }
+    return target;
+}
+
+static char* wxStringErrorMsg = "string type is required for parameter";
+
+#if defined(__WXMSW__)
+    wxString wxPyEmptyStr("");
+    wxPoint  wxPyDefaultPosition(-1, -1);
+    wxSize   wxPyDefaultSize(-1, -1);
+#endif
+
+extern "C" SWIGEXPORT(void) initoglbasicc();
+extern "C" SWIGEXPORT(void) initoglshapesc();
+extern "C" SWIGEXPORT(void) initoglshapes2c();
+extern "C" SWIGEXPORT(void) initoglcanvasc();
+#ifdef __cplusplus
+extern "C" {
+#endif
+static PyObject *_wrap_wxOGLInitialize(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    char *_kwnames[] = {  NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLInitialize",_kwnames)) 
+        return NULL;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxOGLInitialize();
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+static PyObject *_wrap_wxOGLCleanUp(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    char *_kwnames[] = {  NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLCleanUp",_kwnames)) 
+        return NULL;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxOGLCleanUp();
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+static PyMethodDef oglcMethods[] = {
+	 { "wxOGLCleanUp", (PyCFunction) _wrap_wxOGLCleanUp, METH_VARARGS | METH_KEYWORDS },
+	 { "wxOGLInitialize", (PyCFunction) _wrap_wxOGLInitialize, METH_VARARGS | METH_KEYWORDS },
+	 { NULL, NULL }
+};
+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_wxEvent","_class_wxEvent",0},
+    { "_class_wxActivateEvent","_wxActivateEvent",0},
+    { "_signed_long","_long",0},
+    { "_wxMenuEvent","_class_wxMenuEvent",0},
+    { "_class_wxJPEGHandler","_wxJPEGHandler",0},
+    { "_wxPyBitmapDataObject","_class_wxPyBitmapDataObject",0},
+    { "_wxBitmapDataObject","_class_wxBitmapDataObject",0},
+    { "_class_wxPyCommandEvent","_wxPyCommandEvent",0},
+    { "_wxBMPHandler","_class_wxBMPHandler",0},
+    { "_wxImage","_class_wxImage",0},
+    { "_wxPrintQuality","_wxCoord",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_class_wxCustomDataObject","_wxCustomDataObject",0},
+    { "_wxFontData","_class_wxFontData",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_class_wxPyTextDropTarget","_wxPyTextDropTarget",0},
+    { "_class_wxMenuBar","_wxMenuBar",0},
+    { "_class_wxPyTreeItemData","_wxPyTreeItemData",0},
+    { "_class_wxStaticBoxSizer","_wxStaticBoxSizer",0},
+    { "_class_wxEvtHandler","_wxEvtHandler",0},
+    { "_wxPaintEvent","_class_wxPaintEvent",0},
+    { "_wxGIFHandler","_class_wxGIFHandler",0},
+    { "_wxPySizer","_class_wxPySizer",0},
+    { "_wxPyCompositeShape","_class_wxPyCompositeShape",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_wxCursor","_class_wxCursor",0},
+    { "_wxNotifyEvent","_class_wxNotifyEvent",0},
+    { "_wxImageHandler","_class_wxImageHandler",0},
+    { "_class_wxPyRectangleShape","_wxPyRectangleShape",0},
+    { "_class_wxToolBarBase","_wxToolBarBase",0},
+    { "_class_wxTreeCtrl","_wxTreeCtrl",0},
+    { "_wxMask","_class_wxMask",0},
+    { "_wxToolTip","_class_wxToolTip",0},
+    { "_wxPNGHandler","_class_wxPNGHandler",0},
+    { "_class_wxOGLConstraint","_wxOGLConstraint",0},
+    { "_class_wxColourData","_wxColourData",0},
+    { "_class_wxPageSetupDialogData","_wxPageSetupDialogData",0},
+    { "_wxPrinter","_class_wxPrinter",0},
+    { "_wxPseudoMetaFile","_class_wxPseudoMetaFile",0},
+    { "_class_wxArrowHead","_wxArrowHead",0},
+    { "_wxPen","_class_wxPen",0},
+    { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
+    { "_byte","_unsigned_char",0},
+    { "_wxDataObject","_class_wxDataObject",0},
+    { "_class_wxPyFontEnumerator","_wxPyFontEnumerator",0},
+    { "_wxStaticBox","_class_wxStaticBox",0},
+    { "_wxPyDataObjectSimple","_class_wxPyDataObjectSimple",0},
+    { "_wxPyDropSource","_class_wxPyDropSource",0},
+    { "_wxChoice","_class_wxChoice",0},
+    { "_wxSlider","_class_wxSlider",0},
+    { "_wxNotebookEvent","_class_wxNotebookEvent",0},
+    { "_wxPyPrintout","_class_wxPyPrintout",0},
+    { "_wxShapeRegion","_class_wxShapeRegion",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxImageList","_class_wxImageList",0},
+    { "_wxDataObjectSimple","_class_wxDataObjectSimple",0},
+    { "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
+    { "_wxBitmapButton","_class_wxBitmapButton",0},
+    { "_wxSashWindow","_class_wxSashWindow",0},
+    { "_class_wxSizer","_wxSizer",0},
+    { "_class_wxTIFFHandler","_wxTIFFHandler",0},
+    { "_class_wxPrintDialogData","_wxPrintDialogData",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_class_wxClipboard","_wxClipboard",0},
+    { "_class_wxGauge","_wxGauge",0},
+    { "_class_wxSashEvent","_wxSashEvent",0},
+    { "_wxDC","_class_wxDC",0},
+    { "_wxSizerItem","_class_wxSizerItem",0},
+    { "_class_wxBitmapDataObject","_wxBitmapDataObject",0},
+    { "_wxListEvent","_class_wxListEvent",0},
+    { "_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0},
+    { "_wxProgressDialog","_class_wxProgressDialog",0},
+    { "_class_wxBMPHandler","_wxBMPHandler",0},
+    { "_wxPrintPreview","_class_wxPrintPreview",0},
+    { "_wxSpinEvent","_class_wxSpinEvent",0},
+    { "_wxSashLayoutWindow","_class_wxSashLayoutWindow",0},
+    { "_wxPyBitmapShape","_class_wxPyBitmapShape",0},
+    { "_class_wxPyEllipseShape","_wxPyEllipseShape",0},
+    { "_size_t","_wxCoord",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0},
+    { "_wxPNMHandler","_class_wxPNMHandler",0},
+    { "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
+    { "_class_wxPyShapeEvtHandler","_wxPyShapeEvtHandler",0},
+    { "_class_wxMenuItem","_wxMenuItem",0},
+    { "_class_wxPaintEvent","_wxPaintEvent",0},
+    { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
+    { "_class_wxStatusBar","_wxStatusBar",0},
+    { "_class_wxGIFHandler","_wxGIFHandler",0},
+    { "_class_wxPySizer","_wxPySizer",0},
+    { "_class_wxPyCompositeShape","_wxPyCompositeShape",0},
+    { "_wxPyPolygonShape","_class_wxPyPolygonShape",0},
+    { "_class_wxPostScriptDC","_wxPostScriptDC",0},
+    { "_wxPanel","_class_wxPanel",0},
+    { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
+    { "_wxCheckBox","_class_wxCheckBox",0},
+    { "_wxPyEvent","_class_wxPyEvent",0},
+    { "_wxTextCtrl","_class_wxTextCtrl",0},
+    { "_class_wxMask","_wxMask",0},
+    { "_wxTextDataObject","_class_wxTextDataObject",0},
+    { "_class_wxKeyEvent","_wxKeyEvent",0},
+    { "_class_wxToolTip","_wxToolTip",0},
+    { "_class_wxPNGHandler","_wxPNGHandler",0},
+    { "_wxColour","_class_wxColour",0},
+    { "_class_wxDialog","_wxDialog",0},
+    { "_wxBusyCursor","_class_wxBusyCursor",0},
+    { "_wxPageSetupDialog","_class_wxPageSetupDialog",0},
+    { "_class_wxPrinter","_wxPrinter",0},
+    { "_class_wxFileDataObject","_wxFileDataObject",0},
+    { "_wxIdleEvent","_class_wxIdleEvent",0},
+    { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
+    { "_wxToolBar","_class_wxToolBar",0},
+    { "_class_wxDataObject","_wxDataObject",0},
+    { "_wxCaret","_class_wxCaret",0},
+    { "_wxStaticLine","_class_wxStaticLine",0},
+    { "_class_wxLayoutAlgorithm","_wxLayoutAlgorithm",0},
+    { "_wxBrush","_class_wxBrush",0},
+    { "_wxMiniFrame","_class_wxMiniFrame",0},
+    { "_class_wxNotebookEvent","_wxNotebookEvent",0},
+    { "_class_wxPyPrintout","_wxPyPrintout",0},
+    { "_wxDataFormat","_class_wxDataFormat",0},
+    { "_class_wxDataObjectSimple","_wxDataObjectSimple",0},
+    { "_class_wxSashWindow","_wxSashWindow",0},
+    { "_wxShowEvent","_class_wxShowEvent",0},
+    { "_class_wxPyDivisionShape","_wxPyDivisionShape",0},
+    { "_uint","_wxCoord",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_wxPyValidator","_class_wxPyValidator",0},
+    { "_class_wxEvent","_wxEvent",0},
+    { "_wxCheckListBox","_class_wxCheckListBox",0},
+    { "_wxSplitterEvent","_class_wxSplitterEvent",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxCommandEvent","_class_wxCommandEvent",0},
+    { "_wxPyShapeCanvas","_class_wxPyShapeCanvas",0},
+    { "_wxSizeEvent","_class_wxSizeEvent",0},
+    { "_class_wxImage","_wxImage",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_class_wxSashLayoutWindow","_wxSashLayoutWindow",0},
+    { "_class_wxPyBitmapShape","_wxPyBitmapShape",0},
+    { "_class_wxButton","_wxButton",0},
+    { "_wxRadioBox","_class_wxRadioBox",0},
+    { "_class_wxFontData","_wxFontData",0},
+    { "_class_wxPNMHandler","_wxPNMHandler",0},
+    { "_wxBoxSizer","_class_wxBoxSizer",0},
+    { "_wxBitmap","_class_wxBitmap",0},
+    { "_char","_wxDash",0},
+    { "_wxPrintDialog","_class_wxPrintDialog",0},
+    { "_wxPyControlPoint","_class_wxPyControlPoint",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_wxWindowDC","_class_wxWindowDC",0},
+    { "_wxScrollBar","_class_wxScrollBar",0},
+    { "_wxSpinButton","_class_wxSpinButton",0},
+    { "_wxColourDialog","_class_wxColourDialog",0},
+    { "_wxPrintData","_class_wxPrintData",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_class_wxNotifyEvent","_wxNotifyEvent",0},
+    { "_wxMessageDialog","_class_wxMessageDialog",0},
+    { "_class_wxValidator","_wxValidator",0},
+    { "_class_wxPyEvent","_wxPyEvent",0},
+    { "_wxTextEntryDialog","_class_wxTextEntryDialog",0},
+    { "_class_wxIconizeEvent","_wxIconizeEvent",0},
+    { "_class_wxStaticBitmap","_wxStaticBitmap",0},
+    { "_class_wxPyDrawnShape","_wxPyDrawnShape",0},
+    { "_class_wxBusyCursor","_wxBusyCursor",0},
+    { "_wxToolBarSimple","_class_wxToolBarSimple",0},
+    { "_wxMDIChildFrame","_class_wxMDIChildFrame",0},
+    { "_wxListItem","_class_wxListItem",0},
+    { "_class_wxPseudoMetaFile","_wxPseudoMetaFile",0},
+    { "_class_wxToolBar","_wxToolBar",0},
+    { "_wxDropTarget","_class_wxDropTarget",0},
+    { "_class_wxStaticLine","_wxStaticLine",0},
+    { "_wxScrollEvent","_class_wxScrollEvent",0},
+    { "_wxToolBarToolBase","_class_wxToolBarToolBase",0},
+    { "_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0},
+    { "_class_wxShapeRegion","_wxShapeRegion",0},
+    { "_EBool","_wxCoord",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_class_wxDataFormat","_wxDataFormat",0},
+    { "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
+    { "_wxWindowDestroyEvent","_class_wxWindowDestroyEvent",0},
+    { "_class_wxPreviewFrame","_wxPreviewFrame",0},
+    { "_wxStaticText","_class_wxStaticText",0},
+    { "_wxFont","_class_wxFont",0},
+    { "_class_wxPyDropTarget","_wxPyDropTarget",0},
+    { "_wxCloseEvent","_class_wxCloseEvent",0},
+    { "_class_wxSplitterEvent","_wxSplitterEvent",0},
+    { "_wxNotebook","_class_wxNotebook",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxDC","_wxDC",0},
+    { "_wxScrollWinEvent","_class_wxScrollWinEvent",0},
+    { "_wxPyCircleShape","_class_wxPyCircleShape",0},
+    { "_class_wxPyShapeCanvas","_wxPyShapeCanvas",0},
+    { "_class_wxProgressDialog","_wxProgressDialog",0},
+    { "_wxQueryNewPaletteEvent","_class_wxQueryNewPaletteEvent",0},
+    { "_wxPyApp","_class_wxPyApp",0},
+    { "_class_wxWindowCreateEvent","_wxWindowCreateEvent",0},
+    { "_wxMDIParentFrame","_class_wxMDIParentFrame",0},
+    { "_class_wxTreeEvent","_wxTreeEvent",0},
+    { "_class_wxDirDialog","_wxDirDialog",0},
+    { "_wxPyLineShape","_class_wxPyLineShape",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxFocusEvent","_class_wxFocusEvent",0},
+    { "_wxMaximizeEvent","_class_wxMaximizeEvent",0},
+    { "_class_wxSpinButton","_wxSpinButton",0},
+    { "_class_wxPyPolygonShape","_wxPyPolygonShape",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_class_wxPanel","_wxPanel",0},
+    { "_class_wxCheckBox","_wxCheckBox",0},
+    { "_wxComboBox","_class_wxComboBox",0},
+    { "_wxRadioButton","_class_wxRadioButton",0},
+    { "_class_wxMessageDialog","_wxMessageDialog",0},
+    { "_signed_int","_wxCoord",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_class_wxTextCtrl","_wxTextCtrl",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_class_wxTextDataObject","_wxTextDataObject",0},
+    { "_wxMenu","_class_wxMenu",0},
+    { "_class_wxMoveEvent","_wxMoveEvent",0},
+    { "_wxListBox","_class_wxListBox",0},
+    { "_wxScreenDC","_class_wxScreenDC",0},
+    { "_class_wxToolBarSimple","_wxToolBarSimple",0},
+    { "_class_wxMDIChildFrame","_wxMDIChildFrame",0},
+    { "_wxArrowHead","_class_wxArrowHead",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_wxFileDialog","_class_wxFileDialog",0},
+    { "_class_wxDropTarget","_wxDropTarget",0},
+    { "_class_wxCaret","_wxCaret",0},
+    { "_class_wxMDIClientWindow","_wxMDIClientWindow",0},
+    { "_class_wxBrush","_wxBrush",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxWindow","_wxWindow",0},
+    { "_wxSplitterWindow","_class_wxSplitterWindow",0},
+    { "_class_wxStaticText","_wxStaticText",0},
+    { "_wxPrintDialogData","_class_wxPrintDialogData",0},
+    { "_class_wxFont","_wxFont",0},
+    { "_wxClipboard","_class_wxClipboard",0},
+    { "_class_wxPyValidator","_wxPyValidator",0},
+    { "_class_wxCloseEvent","_wxCloseEvent",0},
+    { "_wxSashEvent","_class_wxSashEvent",0},
+    { "_wxBusyInfo","_class_wxBusyInfo",0},
+    { "_class_wxMenuEvent","_wxMenuEvent",0},
+    { "_wxPaletteChangedEvent","_class_wxPaletteChangedEvent",0},
+    { "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
+    { "_class_wxPyCircleShape","_wxPyCircleShape",0},
+    { "_wxClientDC","_class_wxClientDC",0},
+    { "_wxMouseEvent","_class_wxMouseEvent",0},
+    { "_wxListCtrl","_class_wxListCtrl",0},
+    { "_wxSingleChoiceDialog","_class_wxSingleChoiceDialog",0},
+    { "_wxPyDividedShape","_class_wxPyDividedShape",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_class_wxRadioBox","_wxRadioBox",0},
+    { "_class_wxBoxSizer","_wxBoxSizer",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_wxMemoryDC","_class_wxMemoryDC",0},
+    { "_wxPyTextDataObject","_class_wxPyTextDataObject",0},
+    { "_class_wxPrintDialog","_wxPrintDialog",0},
+    { "_class_wxPyControlPoint","_wxPyControlPoint",0},
+    { "_wxPaintDC","_class_wxPaintDC",0},
+    { "_class_wxWindowDC","_wxWindowDC",0},
+    { "_class_wxFocusEvent","_wxFocusEvent",0},
+    { "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
+    { "_wxStatusBar","_class_wxStatusBar",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_class_wxCursor","_wxCursor",0},
+    { "_wxPostScriptDC","_class_wxPostScriptDC",0},
+    { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0},
+    { "_class_wxImageHandler","_wxImageHandler",0},
+    { "_wxPyShape","_class_wxPyShape",0},
+    { "_wxScrolledWindow","_class_wxScrolledWindow",0},
+    { "_wxTreeItemId","_class_wxTreeItemId",0},
+    { "_unsigned_char","_byte",0},
+    { "_class_wxMenu","_wxMenu",0},
+    { "_wxControl","_class_wxControl",0},
+    { "_class_wxListBox","_wxListBox",0},
+    { "_unsigned_int","_wxCoord",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_wxIcon","_class_wxIcon",0},
+    { "_wxDialog","_class_wxDialog",0},
+    { "_class_wxListItem","_wxListItem",0},
+    { "_class_wxPen","_wxPen",0},
+    { "_class_wxFileDialog","_wxFileDialog",0},
+    { "_wxQueryLayoutInfoEvent","_class_wxQueryLayoutInfoEvent",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_class_wxStaticBox","_wxStaticBox",0},
+    { "_wxLayoutAlgorithm","_class_wxLayoutAlgorithm",0},
+    { "_wxPyTextShape","_class_wxPyTextShape",0},
+    { "_class_wxPyDataObjectSimple","_wxPyDataObjectSimple",0},
+    { "_class_wxPyDropSource","_wxPyDropSource",0},
+    { "_class_wxScrollEvent","_wxScrollEvent",0},
+    { "_wxJoystickEvent","_class_wxJoystickEvent",0},
+    { "_class_wxChoice","_wxChoice",0},
+    { "_class_wxSlider","_wxSlider",0},
+    { "_class_wxCalculateLayoutEvent","_wxCalculateLayoutEvent",0},
+    { "_class_wxImageList","_wxImageList",0},
+    { "_class_wxBitmapButton","_wxBitmapButton",0},
+    { "_wxFrame","_class_wxFrame",0},
+    { "_wxPCXHandler","_class_wxPCXHandler",0},
+    { "_wxPyDivisionShape","_class_wxPyDivisionShape",0},
+    { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0},
+    { "_class_wxNotebook","_wxNotebook",0},
+    { "_wxJPEGHandler","_class_wxJPEGHandler",0},
+    { "_wxWindowID","_wxCoord",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_class_wxScrollWinEvent","_wxScrollWinEvent",0},
+    { "_class_wxSizerItem","_wxSizerItem",0},
+    { "_int","_wxCoord",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_class_wxMouseEvent","_wxMouseEvent",0},
+    { "_wxPyCommandEvent","_class_wxPyCommandEvent",0},
+    { "_class_wxListEvent","_wxListEvent",0},
+    { "_class_wxPrintPreview","_wxPrintPreview",0},
+    { "_class_wxSpinEvent","_wxSpinEvent",0},
+    { "_class_wxQueryNewPaletteEvent","_wxQueryNewPaletteEvent",0},
+    { "_class_wxNavigationKeyEvent","_wxNavigationKeyEvent",0},
+    { "_wxButton","_class_wxButton",0},
+    { "_class_wxPyApp","_wxPyApp",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPyTextDataObject","_wxPyTextDataObject",0},
+    { "_class_wxMDIParentFrame","_wxMDIParentFrame",0},
+    { "_wxPyTreeItemData","_class_wxPyTreeItemData",0},
+    { "_wxStaticBoxSizer","_class_wxStaticBoxSizer",0},
+    { "_class_wxPyLineShape","_wxPyLineShape",0},
+    { "_class_wxPaintDC","_wxPaintDC",0},
+    { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
+    { "_class_wxPyFileDropTarget","_wxPyFileDropTarget",0},
+    { "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
+    { "_class_wxComboBox","_wxComboBox",0},
+    { "_class_wxRadioButton","_wxRadioButton",0},
+    { "_class_wxPyShape","_wxPyShape",0},
+    { "_wxValidator","_class_wxValidator",0},
+    { "_wxToolBarBase","_class_wxToolBarBase",0},
+    { "_class_wxTreeItemId","_wxTreeItemId",0},
+    { "_wxTreeCtrl","_class_wxTreeCtrl",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_wxIconizeEvent","_class_wxIconizeEvent",0},
+    { "_class_wxControl","_wxControl",0},
+    { "_wxStaticBitmap","_class_wxStaticBitmap",0},
+    { "_wxPyDrawnShape","_class_wxPyDrawnShape",0},
+    { "_class_wxIcon","_wxIcon",0},
+    { "_class_wxColour","_wxColour",0},
+    { "_class_wxScreenDC","_wxScreenDC",0},
+    { "_class_wxPageSetupDialog","_wxPageSetupDialog",0},
+    { "_wxPalette","_class_wxPalette",0},
+    { "_class_wxIdleEvent","_wxIdleEvent",0},
+    { "_wxCoord","_int",0},
+    { "_wxCoord","_signed_int",0},
+    { "_wxCoord","_unsigned_int",0},
+    { "_wxCoord","_wxWindowID",0},
+    { "_wxCoord","_uint",0},
+    { "_wxCoord","_EBool",0},
+    { "_wxCoord","_size_t",0},
+    { "_wxCoord","_wxPrintQuality",0},
+    { "_wxEraseEvent","_class_wxEraseEvent",0},
+    { "_wxDataObjectComposite","_class_wxDataObjectComposite",0},
+    { "_class_wxJoystickEvent","_wxJoystickEvent",0},
+    { "_class_wxMiniFrame","_wxMiniFrame",0},
+    { "_wxFontDialog","_class_wxFontDialog",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxSplitterWindow","_wxSplitterWindow",0},
+    { "_wxPreviewFrame","_class_wxPreviewFrame",0},
+    { "_wxSizer","_class_wxSizer",0},
+    { "_class_wxShowEvent","_wxShowEvent",0},
+    { "_class_wxPCXHandler","_wxPCXHandler",0},
+    { "_wxTIFFHandler","_class_wxTIFFHandler",0},
+    { "_wxDiagram","_class_wxDiagram",0},
+    { "_wxPyDropTarget","_class_wxPyDropTarget",0},
+    { "_wxActivateEvent","_class_wxActivateEvent",0},
+    { "_wxGauge","_class_wxGauge",0},
+    { "_class_wxCheckListBox","_wxCheckListBox",0},
+    { "_class_wxBusyInfo","_wxBusyInfo",0},
+    { "_class_wxCommandEvent","_wxCommandEvent",0},
+    { "_class_wxClientDC","_wxClientDC",0},
+    { "_class_wxSizeEvent","_wxSizeEvent",0},
+    { "_class_wxListCtrl","_wxListCtrl",0},
+    { "_class_wxPyDividedShape","_wxPyDividedShape",0},
+    { "_wxPyEllipseShape","_class_wxPyEllipseShape",0},
+    { "_wxCustomDataObject","_class_wxCustomDataObject",0},
+    { "_class_wxSize","_wxSize",0},
+    { "_class_wxBitmap","_wxBitmap",0},
+    { "_class_wxMemoryDC","_wxMemoryDC",0},
+    { "_wxPyTextDropTarget","_class_wxPyTextDropTarget",0},
+    { "_wxMenuBar","_class_wxMenuBar",0},
+    { "_wxTreeEvent","_class_wxTreeEvent",0},
+    { "_wxDirDialog","_class_wxDirDialog",0},
+    { "_wxPyShapeEvtHandler","_class_wxPyShapeEvtHandler",0},
+    { "_wxEvtHandler","_class_wxEvtHandler",0},
+    { "_wxMenuItem","_class_wxMenuItem",0},
+    { "_class_wxScrollBar","_wxScrollBar",0},
+    { "_class_wxColourDialog","_wxColourDialog",0},
+    { "_class_wxPrintData","_wxPrintData",0},
+    { "_wxDash","_char",0},
+    { "_wxPyRectangleShape","_class_wxPyRectangleShape",0},
+    { "_class_wxScrolledWindow","_wxScrolledWindow",0},
+    { "_class_wxTextEntryDialog","_wxTextEntryDialog",0},
+    { "_wxKeyEvent","_class_wxKeyEvent",0},
+    { "_wxMoveEvent","_class_wxMoveEvent",0},
+    { "_wxOGLConstraint","_class_wxOGLConstraint",0},
+    { "_wxColourData","_class_wxColourData",0},
+    { "_wxPageSetupDialogData","_class_wxPageSetupDialogData",0},
+    { "_class_wxPalette","_wxPalette",0},
+    { "_wxFileDataObject","_class_wxFileDataObject",0},
+    { "_class_wxQueryLayoutInfoEvent","_wxQueryLayoutInfoEvent",0},
+    { "_class_wxEraseEvent","_wxEraseEvent",0},
+    { "_wxPyFontEnumerator","_class_wxPyFontEnumerator",0},
+    { "_wxMDIClientWindow","_class_wxMDIClientWindow",0},
+    { "_class_wxPyTextShape","_wxPyTextShape",0},
+    { "_class_wxDataObjectComposite","_wxDataObjectComposite",0},
+    { "_class_wxToolBarToolBase","_wxToolBarToolBase",0},
+    { "_class_wxFontDialog","_wxFontDialog",0},
+    { "_wxWindow","_class_wxWindow",0},
+    { "_class_wxWindowDestroyEvent","_wxWindowDestroyEvent",0},
+    { "_class_wxFrame","_wxFrame",0},
+    { "_class_wxDiagram","_wxDiagram",0},
+{0,0,0}};
+
+static PyObject *SWIG_globals;
+#ifdef __cplusplus
+extern "C" 
+#endif
+SWIGEXPORT(void) initoglc() {
+	 PyObject *m, *d;
+	 SWIG_globals = SWIG_newvarlink();
+	 m = Py_InitModule("oglc", oglcMethods);
+	 d = PyModule_GetDict(m);
+	 PyDict_SetItemString(d,"KEY_SHIFT", PyInt_FromLong((long) KEY_SHIFT));
+	 PyDict_SetItemString(d,"KEY_CTRL", PyInt_FromLong((long) KEY_CTRL));
+	 PyDict_SetItemString(d,"ARROW_NONE", PyInt_FromLong((long) ARROW_NONE));
+	 PyDict_SetItemString(d,"ARROW_END", PyInt_FromLong((long) ARROW_END));
+	 PyDict_SetItemString(d,"ARROW_BOTH", PyInt_FromLong((long) ARROW_BOTH));
+	 PyDict_SetItemString(d,"ARROW_MIDDLE", PyInt_FromLong((long) ARROW_MIDDLE));
+	 PyDict_SetItemString(d,"ARROW_START", PyInt_FromLong((long) ARROW_START));
+	 PyDict_SetItemString(d,"ARROW_HOLLOW_CIRCLE", PyInt_FromLong((long) ARROW_HOLLOW_CIRCLE));
+	 PyDict_SetItemString(d,"ARROW_FILLED_CIRCLE", PyInt_FromLong((long) ARROW_FILLED_CIRCLE));
+	 PyDict_SetItemString(d,"ARROW_ARROW", PyInt_FromLong((long) ARROW_ARROW));
+	 PyDict_SetItemString(d,"ARROW_SINGLE_OBLIQUE", PyInt_FromLong((long) ARROW_SINGLE_OBLIQUE));
+	 PyDict_SetItemString(d,"ARROW_DOUBLE_OBLIQUE", PyInt_FromLong((long) ARROW_DOUBLE_OBLIQUE));
+	 PyDict_SetItemString(d,"ARROW_METAFILE", PyInt_FromLong((long) ARROW_METAFILE));
+	 PyDict_SetItemString(d,"ARROW_POSITION_END", PyInt_FromLong((long) ARROW_POSITION_END));
+	 PyDict_SetItemString(d,"ARROW_POSITION_START", PyInt_FromLong((long) ARROW_POSITION_START));
+	 PyDict_SetItemString(d,"CONTROL_POINT_VERTICAL", PyInt_FromLong((long) CONTROL_POINT_VERTICAL));
+	 PyDict_SetItemString(d,"CONTROL_POINT_HORIZONTAL", PyInt_FromLong((long) CONTROL_POINT_HORIZONTAL));
+	 PyDict_SetItemString(d,"CONTROL_POINT_DIAGONAL", PyInt_FromLong((long) CONTROL_POINT_DIAGONAL));
+	 PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_TO", PyInt_FromLong((long) CONTROL_POINT_ENDPOINT_TO));
+	 PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_FROM", PyInt_FromLong((long) CONTROL_POINT_ENDPOINT_FROM));
+	 PyDict_SetItemString(d,"CONTROL_POINT_LINE", PyInt_FromLong((long) CONTROL_POINT_LINE));
+	 PyDict_SetItemString(d,"FORMAT_NONE", PyInt_FromLong((long) FORMAT_NONE));
+	 PyDict_SetItemString(d,"FORMAT_CENTRE_HORIZ", PyInt_FromLong((long) FORMAT_CENTRE_HORIZ));
+	 PyDict_SetItemString(d,"FORMAT_CENTRE_VERT", PyInt_FromLong((long) FORMAT_CENTRE_VERT));
+	 PyDict_SetItemString(d,"FORMAT_SIZE_TO_CONTENTS", PyInt_FromLong((long) FORMAT_SIZE_TO_CONTENTS));
+	 PyDict_SetItemString(d,"LINE_ALIGNMENT_HORIZ", PyInt_FromLong((long) LINE_ALIGNMENT_HORIZ));
+	 PyDict_SetItemString(d,"LINE_ALIGNMENT_VERT", PyInt_FromLong((long) LINE_ALIGNMENT_VERT));
+	 PyDict_SetItemString(d,"LINE_ALIGNMENT_TO_NEXT_HANDLE", PyInt_FromLong((long) LINE_ALIGNMENT_TO_NEXT_HANDLE));
+	 PyDict_SetItemString(d,"LINE_ALIGNMENT_NONE", PyInt_FromLong((long) LINE_ALIGNMENT_NONE));
+	 PyDict_SetItemString(d,"SHADOW_NONE", PyInt_FromLong((long) SHADOW_NONE));
+	 PyDict_SetItemString(d,"SHADOW_LEFT", PyInt_FromLong((long) SHADOW_LEFT));
+	 PyDict_SetItemString(d,"SHADOW_RIGHT", PyInt_FromLong((long) SHADOW_RIGHT));
+	 PyDict_SetItemString(d,"OP_CLICK_LEFT", PyInt_FromLong((long) OP_CLICK_LEFT));
+	 PyDict_SetItemString(d,"OP_CLICK_RIGHT", PyInt_FromLong((long) OP_CLICK_RIGHT));
+	 PyDict_SetItemString(d,"OP_DRAG_LEFT", PyInt_FromLong((long) OP_DRAG_LEFT));
+	 PyDict_SetItemString(d,"OP_DRAG_RIGHT", PyInt_FromLong((long) OP_DRAG_RIGHT));
+	 PyDict_SetItemString(d,"OP_ALL", PyInt_FromLong((long) OP_ALL));
+	 PyDict_SetItemString(d,"ATTACHMENT_MODE_NONE", PyInt_FromLong((long) ATTACHMENT_MODE_NONE));
+	 PyDict_SetItemString(d,"ATTACHMENT_MODE_EDGE", PyInt_FromLong((long) ATTACHMENT_MODE_EDGE));
+	 PyDict_SetItemString(d,"ATTACHMENT_MODE_BRANCHING", PyInt_FromLong((long) ATTACHMENT_MODE_BRANCHING));
+	 PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_NORMAL", PyInt_FromLong((long) BRANCHING_ATTACHMENT_NORMAL));
+	 PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_BLOB", PyInt_FromLong((long) BRANCHING_ATTACHMENT_BLOB));
+	 PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_VERTICALLY", PyInt_FromLong((long) gyCONSTRAINT_CENTRED_VERTICALLY));
+	 PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_HORIZONTALLY", PyInt_FromLong((long) gyCONSTRAINT_CENTRED_HORIZONTALLY));
+	 PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_BOTH", PyInt_FromLong((long) gyCONSTRAINT_CENTRED_BOTH));
+	 PyDict_SetItemString(d,"gyCONSTRAINT_LEFT_OF", PyInt_FromLong((long) gyCONSTRAINT_LEFT_OF));
+	 PyDict_SetItemString(d,"gyCONSTRAINT_RIGHT_OF", PyInt_FromLong((long) gyCONSTRAINT_RIGHT_OF));
+	 PyDict_SetItemString(d,"gyCONSTRAINT_ABOVE", PyInt_FromLong((long) gyCONSTRAINT_ABOVE));
+	 PyDict_SetItemString(d,"gyCONSTRAINT_BELOW", PyInt_FromLong((long) gyCONSTRAINT_BELOW));
+	 PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_TOP", PyInt_FromLong((long) gyCONSTRAINT_ALIGNED_TOP));
+	 PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_BOTTOM", PyInt_FromLong((long) gyCONSTRAINT_ALIGNED_BOTTOM));
+	 PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_LEFT", PyInt_FromLong((long) gyCONSTRAINT_ALIGNED_LEFT));
+	 PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_RIGHT", PyInt_FromLong((long) gyCONSTRAINT_ALIGNED_RIGHT));
+	 PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_TOP", PyInt_FromLong((long) gyCONSTRAINT_MIDALIGNED_TOP));
+	 PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_BOTTOM", PyInt_FromLong((long) gyCONSTRAINT_MIDALIGNED_BOTTOM));
+	 PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_LEFT", PyInt_FromLong((long) gyCONSTRAINT_MIDALIGNED_LEFT));
+	 PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_RIGHT", PyInt_FromLong((long) gyCONSTRAINT_MIDALIGNED_RIGHT));
+	 PyDict_SetItemString(d,"DIVISION_SIDE_NONE", PyInt_FromLong((long) DIVISION_SIDE_NONE));
+	 PyDict_SetItemString(d,"DIVISION_SIDE_LEFT", PyInt_FromLong((long) DIVISION_SIDE_LEFT));
+	 PyDict_SetItemString(d,"DIVISION_SIDE_TOP", PyInt_FromLong((long) DIVISION_SIDE_TOP));
+	 PyDict_SetItemString(d,"DIVISION_SIDE_RIGHT", PyInt_FromLong((long) DIVISION_SIDE_RIGHT));
+	 PyDict_SetItemString(d,"DIVISION_SIDE_BOTTOM", PyInt_FromLong((long) DIVISION_SIDE_BOTTOM));
+
+
+    initoglbasicc();
+    initoglshapesc();
+    initoglshapes2c();
+    initoglcanvasc();
+
+
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();
+
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}
+}

wxPython/contrib/ogl/ogl.i

@@ -0,0 +1,175 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        ogl.i
+// Purpose:     SWIG definitions for the wxWindows Object Graphics Library
+//
+// Author:      Robin Dunn
+//
+// Created:     30-June-1999
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 by Total Control Software
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+
+%module ogl
+
+%{
+#include "helpers.h"
+#include "oglhelpers.h"
+%}
+
+//---------------------------------------------------------------------------
+
+%include typemaps.i
+%include my_typemaps.i
+
+%extern wx.i
+%import windows.i
+%extern _defs.i
+%extern misc.i
+%extern gdi.i
+
+%include _ogldefs.i
+
+%import oglbasic.i
+%import oglshapes.i
+%import oglshapes2.i
+%import oglcanvas.i
+
+
+%{
+#if defined(__WXMSW__)
+    wxString wxPyEmptyStr("");
+    wxPoint  wxPyDefaultPosition(-1, -1);
+    wxSize   wxPyDefaultSize(-1, -1);
+#endif
+%}
+
+%pragma(python) code = "import wx"
+
+//---------------------------------------------------------------------------
+
+
+enum {
+    KEY_SHIFT,
+    KEY_CTRL,
+    ARROW_NONE,
+    ARROW_END,
+    ARROW_BOTH,
+    ARROW_MIDDLE,
+    ARROW_START,
+    ARROW_HOLLOW_CIRCLE,
+    ARROW_FILLED_CIRCLE,
+    ARROW_ARROW,
+    ARROW_SINGLE_OBLIQUE,
+    ARROW_DOUBLE_OBLIQUE,
+    ARROW_METAFILE,
+    ARROW_POSITION_END,
+    ARROW_POSITION_START,
+    CONTROL_POINT_VERTICAL,
+    CONTROL_POINT_HORIZONTAL,
+    CONTROL_POINT_DIAGONAL,
+    CONTROL_POINT_ENDPOINT_TO,
+    CONTROL_POINT_ENDPOINT_FROM,
+    CONTROL_POINT_LINE,
+    FORMAT_NONE,
+    FORMAT_CENTRE_HORIZ,
+    FORMAT_CENTRE_VERT,
+    FORMAT_SIZE_TO_CONTENTS,
+    LINE_ALIGNMENT_HORIZ,
+    LINE_ALIGNMENT_VERT,
+    LINE_ALIGNMENT_TO_NEXT_HANDLE,
+    LINE_ALIGNMENT_NONE,
+    SHADOW_NONE,
+    SHADOW_LEFT,
+    SHADOW_RIGHT,
+//      SHAPE_BASIC,
+//      SHAPE_RECTANGLE,
+//      SHAPE_ELLIPSE,
+//      SHAPE_POLYGON,
+//      SHAPE_CIRCLE,
+//      SHAPE_LINE,
+//      SHAPE_DIVIDED_RECTANGLE,
+//      SHAPE_COMPOSITE,
+//      SHAPE_CONTROL_POINT,
+//      SHAPE_DRAWN,
+//      SHAPE_DIVISION,
+//      SHAPE_LABEL_OBJECT,
+//      SHAPE_BITMAP,
+//      SHAPE_DIVIDED_OBJECT_CONTROL_POINT,
+//      OBJECT_REGION,
+    OP_CLICK_LEFT,
+    OP_CLICK_RIGHT,
+    OP_DRAG_LEFT,
+    OP_DRAG_RIGHT,
+    OP_ALL,
+    ATTACHMENT_MODE_NONE,
+    ATTACHMENT_MODE_EDGE,
+    ATTACHMENT_MODE_BRANCHING,
+    BRANCHING_ATTACHMENT_NORMAL,
+    BRANCHING_ATTACHMENT_BLOB,
+
+    gyCONSTRAINT_CENTRED_VERTICALLY,
+    gyCONSTRAINT_CENTRED_HORIZONTALLY,
+    gyCONSTRAINT_CENTRED_BOTH,
+    gyCONSTRAINT_LEFT_OF,
+    gyCONSTRAINT_RIGHT_OF,
+    gyCONSTRAINT_ABOVE,
+    gyCONSTRAINT_BELOW,
+    gyCONSTRAINT_ALIGNED_TOP,
+    gyCONSTRAINT_ALIGNED_BOTTOM,
+    gyCONSTRAINT_ALIGNED_LEFT,
+    gyCONSTRAINT_ALIGNED_RIGHT,
+    gyCONSTRAINT_MIDALIGNED_TOP,
+    gyCONSTRAINT_MIDALIGNED_BOTTOM,
+    gyCONSTRAINT_MIDALIGNED_LEFT,
+    gyCONSTRAINT_MIDALIGNED_RIGHT,
+
+    DIVISION_SIDE_NONE,
+    DIVISION_SIDE_LEFT,
+    DIVISION_SIDE_TOP,
+    DIVISION_SIDE_RIGHT,
+    DIVISION_SIDE_BOTTOM,
+
+};
+
+
+
+//---------------------------------------------------------------------------
+
+void wxOGLInitialize();
+void wxOGLCleanUp();
+
+
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+%{
+extern "C" SWIGEXPORT(void) initoglbasicc();
+extern "C" SWIGEXPORT(void) initoglshapesc();
+extern "C" SWIGEXPORT(void) initoglshapes2c();
+extern "C" SWIGEXPORT(void) initoglcanvasc();
+%}
+
+
+%init %{
+
+    initoglbasicc();
+    initoglshapesc();
+    initoglshapes2c();
+    initoglcanvasc();
+
+
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();
+
+%}
+
+//----------------------------------------------------------------------
+// And this gets appended to the shadow class file.
+//----------------------------------------------------------------------
+
+%pragma(python) include="_extras.py";
+
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------

wxPython/contrib/ogl/ogl.py

@@ -0,0 +1,159 @@
+# This file was created automatically by SWIG.
+import oglc
+
+from misc import *
+
+from misc2 import *
+
+from windows import *
+
+from gdi import *
+
+from clip_dnd import *
+
+from events import *
+
+from mdi import *
+
+from frames import *
+
+from stattool import *
+
+from controls import *
+
+from controls2 import *
+
+from windows2 import *
+
+from cmndlgs import *
+
+from windows3 import *
+
+from image import *
+
+from printfw import *
+
+from sizers import *
+
+from oglbasic import *
+
+from oglshapes import *
+
+from oglshapes2 import *
+
+from oglcanvas import *
+import wx
+
+
+#-------------- FUNCTION WRAPPERS ------------------
+
+wxOGLInitialize = oglc.wxOGLInitialize
+
+wxOGLCleanUp = oglc.wxOGLCleanUp
+
+
+
+#-------------- VARIABLE WRAPPERS ------------------
+
+KEY_SHIFT = oglc.KEY_SHIFT
+KEY_CTRL = oglc.KEY_CTRL
+ARROW_NONE = oglc.ARROW_NONE
+ARROW_END = oglc.ARROW_END
+ARROW_BOTH = oglc.ARROW_BOTH
+ARROW_MIDDLE = oglc.ARROW_MIDDLE
+ARROW_START = oglc.ARROW_START
+ARROW_HOLLOW_CIRCLE = oglc.ARROW_HOLLOW_CIRCLE
+ARROW_FILLED_CIRCLE = oglc.ARROW_FILLED_CIRCLE
+ARROW_ARROW = oglc.ARROW_ARROW
+ARROW_SINGLE_OBLIQUE = oglc.ARROW_SINGLE_OBLIQUE
+ARROW_DOUBLE_OBLIQUE = oglc.ARROW_DOUBLE_OBLIQUE
+ARROW_METAFILE = oglc.ARROW_METAFILE
+ARROW_POSITION_END = oglc.ARROW_POSITION_END
+ARROW_POSITION_START = oglc.ARROW_POSITION_START
+CONTROL_POINT_VERTICAL = oglc.CONTROL_POINT_VERTICAL
+CONTROL_POINT_HORIZONTAL = oglc.CONTROL_POINT_HORIZONTAL
+CONTROL_POINT_DIAGONAL = oglc.CONTROL_POINT_DIAGONAL
+CONTROL_POINT_ENDPOINT_TO = oglc.CONTROL_POINT_ENDPOINT_TO
+CONTROL_POINT_ENDPOINT_FROM = oglc.CONTROL_POINT_ENDPOINT_FROM
+CONTROL_POINT_LINE = oglc.CONTROL_POINT_LINE
+FORMAT_NONE = oglc.FORMAT_NONE
+FORMAT_CENTRE_HORIZ = oglc.FORMAT_CENTRE_HORIZ
+FORMAT_CENTRE_VERT = oglc.FORMAT_CENTRE_VERT
+FORMAT_SIZE_TO_CONTENTS = oglc.FORMAT_SIZE_TO_CONTENTS
+LINE_ALIGNMENT_HORIZ = oglc.LINE_ALIGNMENT_HORIZ
+LINE_ALIGNMENT_VERT = oglc.LINE_ALIGNMENT_VERT
+LINE_ALIGNMENT_TO_NEXT_HANDLE = oglc.LINE_ALIGNMENT_TO_NEXT_HANDLE
+LINE_ALIGNMENT_NONE = oglc.LINE_ALIGNMENT_NONE
+SHADOW_NONE = oglc.SHADOW_NONE
+SHADOW_LEFT = oglc.SHADOW_LEFT
+SHADOW_RIGHT = oglc.SHADOW_RIGHT
+OP_CLICK_LEFT = oglc.OP_CLICK_LEFT
+OP_CLICK_RIGHT = oglc.OP_CLICK_RIGHT
+OP_DRAG_LEFT = oglc.OP_DRAG_LEFT
+OP_DRAG_RIGHT = oglc.OP_DRAG_RIGHT
+OP_ALL = oglc.OP_ALL
+ATTACHMENT_MODE_NONE = oglc.ATTACHMENT_MODE_NONE
+ATTACHMENT_MODE_EDGE = oglc.ATTACHMENT_MODE_EDGE
+ATTACHMENT_MODE_BRANCHING = oglc.ATTACHMENT_MODE_BRANCHING
+BRANCHING_ATTACHMENT_NORMAL = oglc.BRANCHING_ATTACHMENT_NORMAL
+BRANCHING_ATTACHMENT_BLOB = oglc.BRANCHING_ATTACHMENT_BLOB
+gyCONSTRAINT_CENTRED_VERTICALLY = oglc.gyCONSTRAINT_CENTRED_VERTICALLY
+gyCONSTRAINT_CENTRED_HORIZONTALLY = oglc.gyCONSTRAINT_CENTRED_HORIZONTALLY
+gyCONSTRAINT_CENTRED_BOTH = oglc.gyCONSTRAINT_CENTRED_BOTH
+gyCONSTRAINT_LEFT_OF = oglc.gyCONSTRAINT_LEFT_OF
+gyCONSTRAINT_RIGHT_OF = oglc.gyCONSTRAINT_RIGHT_OF
+gyCONSTRAINT_ABOVE = oglc.gyCONSTRAINT_ABOVE
+gyCONSTRAINT_BELOW = oglc.gyCONSTRAINT_BELOW
+gyCONSTRAINT_ALIGNED_TOP = oglc.gyCONSTRAINT_ALIGNED_TOP
+gyCONSTRAINT_ALIGNED_BOTTOM = oglc.gyCONSTRAINT_ALIGNED_BOTTOM
+gyCONSTRAINT_ALIGNED_LEFT = oglc.gyCONSTRAINT_ALIGNED_LEFT
+gyCONSTRAINT_ALIGNED_RIGHT = oglc.gyCONSTRAINT_ALIGNED_RIGHT
+gyCONSTRAINT_MIDALIGNED_TOP = oglc.gyCONSTRAINT_MIDALIGNED_TOP
+gyCONSTRAINT_MIDALIGNED_BOTTOM = oglc.gyCONSTRAINT_MIDALIGNED_BOTTOM
+gyCONSTRAINT_MIDALIGNED_LEFT = oglc.gyCONSTRAINT_MIDALIGNED_LEFT
+gyCONSTRAINT_MIDALIGNED_RIGHT = oglc.gyCONSTRAINT_MIDALIGNED_RIGHT
+DIVISION_SIDE_NONE = oglc.DIVISION_SIDE_NONE
+DIVISION_SIDE_LEFT = oglc.DIVISION_SIDE_LEFT
+DIVISION_SIDE_TOP = oglc.DIVISION_SIDE_TOP
+DIVISION_SIDE_RIGHT = oglc.DIVISION_SIDE_RIGHT
+DIVISION_SIDE_BOTTOM = oglc.DIVISION_SIDE_BOTTOM
+
+
+#-------------- USER INCLUDE -----------------------
+
+
+wxShapeCanvas =       wxPyShapeCanvas
+wxShapeEvtHandler =   wxPyShapeEvtHandler
+wxShape =             wxPyShape
+wxRectangleShape =    wxPyRectangleShape
+wxBitmapShape =       wxPyBitmapShape
+wxDrawnShape =        wxPyDrawnShape
+wxCompositeShape =    wxPyCompositeShape
+wxDividedShape =      wxPyDividedShape
+wxDivisionShape =     wxPyDivisionShape
+wxEllipseShape =      wxPyEllipseShape
+wxCircleShape =       wxPyCircleShape
+wxLineShape =         wxPyLineShape
+wxPolygonShape =      wxPyPolygonShape
+wxTextShape =         wxPyTextShape
+wxControlPoint =      wxPyControlPoint
+
+# Stuff these names into the wx namespace so wxPyConstructObject can find them
+import wx
+wx.wxPyShapeCanvasPtr     = wxPyShapeCanvasPtr
+wx.wxPyShapeEvtHandlerPtr = wxPyShapeEvtHandlerPtr
+wx.wxPyShapePtr           = wxPyShapePtr
+wx.wxPyRectangleShapePtr  = wxPyRectangleShapePtr
+wx.wxPyBitmapShapePtr     = wxPyBitmapShapePtr
+wx.wxPyDrawnShapePtr      = wxPyDrawnShapePtr
+wx.wxPyCompositeShapePtr  = wxPyCompositeShapePtr
+wx.wxPyDividedShapePtr    = wxPyDividedShapePtr
+wx.wxPyDivisionShapePtr   = wxPyDivisionShapePtr
+wx.wxPyEllipseShapePtr    = wxPyEllipseShapePtr
+wx.wxPyCircleShapePtr     = wxPyCircleShapePtr
+wx.wxPyLineShapePtr       = wxPyLineShapePtr
+wx.wxPyPolygonShapePtr    = wxPyPolygonShapePtr
+wx.wxPyTextShapePtr       = wxPyTextShapePtr
+wx.wxShapeRegionPtr       = wxShapeRegionPtr
+wx.wxOGLConstraintPtr     = wxOGLConstraintPtr
+wx.wxControlPointPtr      = wxPyControlPointPtr

wxPython/contrib/ogl/oglbasic.i

@@ -0,0 +1,401 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        oglbasic.i
+// Purpose:     SWIG definitions for the wxWindows Object Graphics Library
+//
+// Author:      Robin Dunn
+//
+// Created:     3-Sept-1999
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 by Total Control Software
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+
+%module oglbasic
+
+%{
+#include "helpers.h"
+#include "oglhelpers.h"
+%}
+
+//---------------------------------------------------------------------------
+
+%include typemaps.i
+%include my_typemaps.i
+
+%extern wx.i
+%import windows.i
+%extern _defs.i
+%extern misc.i
+%extern gdi.i
+
+%include _ogldefs.i
+
+//%extern oglcanvas.i
+
+
+%pragma(python) code = "import wx"
+%pragma(python) code = "from oglcanvas import wxPyShapeCanvasPtr"
+
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+
+
+class wxShapeRegion {
+public:
+    wxShapeRegion();
+    //~wxShapeRegion();
+
+    void SetText(const wxString& s);
+    void SetFont(wxFont *f);
+    void SetMinSize(double w, double h);
+    void SetSize(double w, double h);
+    void SetPosition(double x, double y);
+    void SetProportions(double x, double y);
+    void SetFormatMode(int mode);
+    void SetName(const wxString& s);
+    void SetColour(const wxString& col);
+
+    wxString GetText();
+    wxFont *GetFont();
+    void GetMinSize(double *OUTPUT, double *OUTPUT);
+    void GetProportion(double *OUTPUT, double *OUTPUT);
+    void GetSize(double *OUTPUT, double *OUTPUT);
+    void GetPosition(double *OUTPUT, double *OUTPUT);
+    int GetFormatMode();
+    wxString GetName();
+    wxString GetColour();
+    wxColour *GetActualColourObject();
+    wxList& GetFormattedText();
+    wxString GetPenColour();
+    int GetPenStyle();
+    void SetPenStyle(int style);
+    void SetPenColour(const wxString& col);
+    wxPen *GetActualPen();
+    double GetWidth();
+    double GetHeight();
+
+    void ClearText();
+};
+
+
+//---------------------------------------------------------------------------
+
+%{
+    WXSHAPE_IMP_CALLBACKS(wxPyShapeEvtHandler,wxShapeEvtHandler);
+%}
+
+
+class wxPyShapeEvtHandler {
+public:
+    wxPyShapeEvtHandler(wxPyShapeEvtHandler *prev = NULL,
+                        wxPyShape *shape = NULL);
+
+    void _setSelf(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyShapeEvtHandler)"
+
+    %addmethods {
+        void Destroy() { delete self; }
+    }
+
+    void SetShape(wxPyShape *sh);
+    wxPyShape *GetShape();
+    void SetPreviousHandler(wxPyShapeEvtHandler* handler);
+    wxPyShapeEvtHandler* GetPreviousHandler();
+    wxPyShapeEvtHandler* CreateNewCopy();
+
+    void base_OnDelete();
+    void base_OnDraw(wxDC& dc);
+    void base_OnDrawContents(wxDC& dc);
+    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
+    void base_OnMoveLinks(wxDC& dc);
+    void base_OnErase(wxDC& dc);
+    void base_OnEraseContents(wxDC& dc);
+    void base_OnHighlight(wxDC& dc);
+    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnSize(double x, double y);
+    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
+    void base_OnDrawControlPoints(wxDC& dc);
+    void base_OnEraseControlPoints(wxDC& dc);
+    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginSize(double w, double h);
+    void base_OnEndSize(double w, double h);
+//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
+};
+
+//---------------------------------------------------------------------------
+%{
+    WXSHAPE_IMP_CALLBACKS(wxPyShape, wxShape);
+%}
+
+
+class wxPyShape : public wxPyShapeEvtHandler {
+public:
+    // wxPyShape(wxPyShapeCanvas *can = NULL);     abstract base class...
+
+    void _setSelf(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyShape)"
+
+    %addmethods {
+        void Destroy() { delete self; }
+    }
+
+    void GetBoundingBoxMax(double *OUTPUT, double *OUTPUT);
+    void GetBoundingBoxMin(double *OUTPUT, double *OUTPUT);
+    bool GetPerimeterPoint(double x1, double y1,
+                           double x2, double y2,
+                           double *OUTPUT, double *OUTPUT);
+    wxPyShapeCanvas *GetCanvas();
+    void SetCanvas(wxPyShapeCanvas *the_canvas);
+    void AddToCanvas(wxPyShapeCanvas *the_canvas, wxPyShape *addAfter = NULL);
+    void InsertInCanvas(wxPyShapeCanvas *the_canvas);
+    void RemoveFromCanvas(wxPyShapeCanvas *the_canvas);
+    double GetX();
+    double GetY();
+    void SetX(double x);
+    void SetY(double y);
+    wxPyShape *GetParent();
+    void SetParent(wxPyShape *p);
+    wxPyShape *GetTopAncestor();
+
+
+    // wxList& GetChildren();
+    %addmethods {
+        PyObject* GetChildren() {
+            wxList& list = self->GetChildren();
+            return wxPy_ConvertList(&list, "wxPyShape");
+        }
+    }
+
+
+    void Unlink();
+    void SetDrawHandles(bool drawH);
+    bool GetDrawHandles();
+    void MakeControlPoints();
+    void DeleteControlPoints(wxDC *dc = NULL);
+    void ResetControlPoints();
+    wxPyShapeEvtHandler *GetEventHandler();
+    void SetEventHandler(wxPyShapeEvtHandler *handler);
+    void MakeMandatoryControlPoints();
+    void ResetMandatoryControlPoints();
+    bool Recompute();
+    void CalculateSize();
+    void Select(bool select = TRUE, wxDC* dc = NULL);
+    void SetHighlight(bool hi = TRUE, bool recurse = FALSE);
+    bool IsHighlighted() ;
+    bool Selected();
+    bool AncestorSelected();
+    void SetSensitivityFilter(int sens = OP_ALL, bool recursive = FALSE);
+    int GetSensitivityFilter();
+    void SetDraggable(bool drag, bool recursive = FALSE);
+    void SetFixedSize(bool x, bool y);
+    void GetFixedSize(bool *OUTPUT, bool *OUTPUT) ;
+    bool GetFixedWidth();
+    bool GetFixedHeight();
+    void SetSpaceAttachments(bool sp);
+    bool GetSpaceAttachments() ;
+    void SetShadowMode(int mode, bool redraw = FALSE);
+    int GetShadowMode();
+    bool HitTest(double x, double y, int *OUTPUT, double *OUTPUT);
+    void SetCentreResize(bool cr);
+    bool GetCentreResize();
+    void SetMaintainAspectRatio(bool ar);
+    bool GetMaintainAspectRatio();
+
+
+    // wxList& GetLines();
+    %addmethods {
+        PyObject* GetLines() {
+            wxList& list = self->GetLines();
+            return wxPy_ConvertList(&list, "wxPyLineShape");
+        }
+    }
+
+    void SetDisableLabel(bool flag);
+    bool GetDisableLabel();
+    void SetAttachmentMode(int mode);
+    int GetAttachmentMode();
+    void SetId(long i);
+    long GetId();
+    void SetPen(wxPen *pen);
+    void SetBrush(wxBrush *brush);
+
+    // void SetClientData(wxObject *client_data);
+    // wxObject *GetClientData();
+    %addmethods {
+        void SetClientData(PyObject* userData) {
+            wxPyUserData* data = NULL;
+            if (userData)
+                data = new wxPyUserData(userData);
+            self->SetClientData(data);
+        }
+
+        PyObject* GetClientData() {
+            wxPyUserData* data = (wxPyUserData*)self->GetClientData();
+            if (data) {
+                Py_INCREF(data->m_obj);
+                return data->m_obj;
+            } else {
+                Py_INCREF(Py_None);
+                return Py_None;
+            }
+        }
+    }
+
+    void Show(bool show);
+    bool IsShown();
+    void Move(wxDC& dc, double x1, double y1, bool display = TRUE);
+    void Erase(wxDC& dc);
+    void EraseContents(wxDC& dc);
+    void Draw(wxDC& dc);
+    void Flash();
+    void MoveLinks(wxDC& dc);
+    void DrawContents(wxDC& dc);
+    void SetSize(double x, double y, bool recursive = TRUE);
+    void SetAttachmentSize(double x, double y);
+    void Attach(wxPyShapeCanvas *can);
+    void Detach();
+    bool Constrain();
+    void AddLine(wxPyLineShape *line, wxPyShape *other,
+                 int attachFrom = 0, int attachTo = 0,
+                 int positionFrom = -1, int positionTo = -1);
+    int GetLinePosition(wxPyLineShape* line);
+    void AddText(const wxString& string);
+    wxPen *GetPen();
+    wxBrush *GetBrush();
+    void SetDefaultRegionSize();
+    void FormatText(wxDC& dc, const wxString& s, int regionId = 0);
+    void SetFormatMode(int mode, int regionId = 0);
+    int GetFormatMode(int regionId = 0);
+    void SetFont(wxFont *font, int regionId = 0);
+    wxFont *GetFont(int regionId = 0);
+    void SetTextColour(const wxString& colour, int regionId = 0);
+    wxString GetTextColour(int regionId = 0);
+    int GetNumberOfTextRegions();
+    void SetRegionName(const wxString& name, int regionId = 0);
+    wxString GetRegionName(int regionId);
+    int GetRegionId(const wxString& name);
+    void NameRegions(const wxString& parentName = "");
+
+    // wxList& GetRegions();
+    %addmethods {
+        PyObject* GetRegions() {
+            wxList& list = self->GetRegions();
+            return wxPy_ConvertList(&list, "wxShapeRegion");
+        }
+    }
+
+    void AddRegion(wxShapeRegion *region);
+    void ClearRegions();
+    void AssignNewIds();
+    wxPyShape *FindRegion(const wxString& regionName, int *OUTPUT);
+    void FindRegionNames(wxStringList& list);
+    void ClearText(int regionId = 0);
+    void RemoveLine(wxPyLineShape *line);
+
+#ifdef PROLOGIO
+    void WriteAttributes(wxExpr *clause);
+    void ReadAttributes(wxExpr *clause);
+    void ReadConstraints(wxExpr *clause, wxExprDatabase *database);
+    void WriteRegions(wxExpr *clause);
+    void ReadRegions(wxExpr *clause);
+#endif
+
+    bool GetAttachmentPosition(int attachment, double *OUTPUT, double *OUTPUT,
+                               int nth = 0, int no_arcs = 1, wxPyLineShape *line = NULL);
+    int GetNumberOfAttachments();
+    bool AttachmentIsValid(int attachment);
+    bool GetAttachmentPositionEdge(int attachment, double *OUTPUT, double *OUTPUT,
+                                   int nth = 0, int no_arcs = 1, wxPyLineShape *line = NULL);
+    wxRealPoint CalcSimpleAttachment(const wxRealPoint& pt1, const wxRealPoint& pt2,
+                                     int nth, int noArcs, wxPyLineShape* line);
+    bool AttachmentSortTest(int attachmentPoint, const wxRealPoint& pt1, const wxRealPoint& pt2);
+    void EraseLinks(wxDC& dc, int attachment = -1, bool recurse = FALSE);
+    void DrawLinks(wxDC& dc, int attachment = -1, bool recurse = FALSE);
+    bool MoveLineToNewAttachment(wxDC& dc, wxPyLineShape *to_move,
+                                 double x, double y);
+
+    //void ApplyAttachmentOrdering(wxList& linesToSort);
+    %addmethods {
+        void ApplyAttachmentOrdering(PyObject* linesToSort) {
+            wxList* list = wxPy_wxListHelper(linesToSort, "_wxPyLineShape_p");
+            self->ApplyAttachmentOrdering(*list);
+            delete list;
+        }
+    }
+
+    wxRealPoint GetBranchingAttachmentRoot(int attachment);
+    bool GetBranchingAttachmentInfo(int attachment, wxRealPoint& root, wxRealPoint& neck,
+                                    wxRealPoint& shoulder1, wxRealPoint& shoulder2);
+    bool GetBranchingAttachmentPoint(int attachment, int n, wxRealPoint& attachmentPoint,
+                                     wxRealPoint& stemPoint);
+    int GetAttachmentLineCount(int attachment);
+    void SetBranchNeckLength(int len);
+    int GetBranchNeckLength();
+    void SetBranchStemLength(int len);
+    int GetBranchStemLength();
+    void SetBranchSpacing(int len);
+    int GetBranchSpacing();
+    void SetBranchStyle(long style);
+    long GetBranchStyle();
+    int PhysicalToLogicalAttachment(int physicalAttachment);
+    int LogicalToPhysicalAttachment(int logicalAttachment);
+    bool Draggable();
+    bool HasDescendant(wxPyShape *image);
+    wxPyShape *CreateNewCopy(bool resetMapping = TRUE, bool recompute = TRUE);
+    void Copy(wxPyShape& copy);
+    void CopyWithHandler(wxPyShape& copy);
+    void Rotate(double x, double y, double theta);
+    double GetRotation();
+    void ClearAttachments();
+    void Recentre(wxDC& dc);
+    void ClearPointList(wxList& list);
+
+    void base_OnDelete();
+    void base_OnDraw(wxDC& dc);
+    void base_OnDrawContents(wxDC& dc);
+    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
+    void base_OnMoveLinks(wxDC& dc);
+    void base_OnErase(wxDC& dc);
+    void base_OnEraseContents(wxDC& dc);
+    void base_OnHighlight(wxDC& dc);
+    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnSize(double x, double y);
+    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
+    void base_OnDrawControlPoints(wxDC& dc);
+    void base_OnEraseControlPoints(wxDC& dc);
+    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginSize(double w, double h);
+    void base_OnEndSize(double w, double h);
+//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
+};
+
+//---------------------------------------------------------------------------
+

wxPython/contrib/ogl/oglbasic.py

@@ -0,0 +1,791 @@
+# This file was created automatically by SWIG.
+import oglbasicc
+
+from misc import *
+
+from misc2 import *
+
+from windows import *
+
+from gdi import *
+
+from clip_dnd import *
+
+from events import *
+
+from mdi import *
+
+from frames import *
+
+from stattool import *
+
+from controls import *
+
+from controls2 import *
+
+from windows2 import *
+
+from cmndlgs import *
+
+from windows3 import *
+
+from image import *
+
+from printfw import *
+
+from sizers import *
+import wx
+from oglcanvas import wxPyShapeCanvasPtr
+class wxShapeRegionPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def SetText(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_SetText,(self,) + _args, _kwargs)
+        return val
+    def SetFont(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_SetFont,(self,) + _args, _kwargs)
+        return val
+    def SetMinSize(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_SetMinSize,(self,) + _args, _kwargs)
+        return val
+    def SetSize(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_SetSize,(self,) + _args, _kwargs)
+        return val
+    def SetPosition(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_SetPosition,(self,) + _args, _kwargs)
+        return val
+    def SetProportions(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_SetProportions,(self,) + _args, _kwargs)
+        return val
+    def SetFormatMode(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_SetFormatMode,(self,) + _args, _kwargs)
+        return val
+    def SetName(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_SetName,(self,) + _args, _kwargs)
+        return val
+    def SetColour(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_SetColour,(self,) + _args, _kwargs)
+        return val
+    def GetText(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_GetText,(self,) + _args, _kwargs)
+        return val
+    def GetFont(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_GetFont,(self,) + _args, _kwargs)
+        if val: val = wxFontPtr(val) 
+        return val
+    def GetMinSize(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_GetMinSize,(self,) + _args, _kwargs)
+        return val
+    def GetProportion(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_GetProportion,(self,) + _args, _kwargs)
+        return val
+    def GetSize(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_GetSize,(self,) + _args, _kwargs)
+        return val
+    def GetPosition(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_GetPosition,(self,) + _args, _kwargs)
+        return val
+    def GetFormatMode(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_GetFormatMode,(self,) + _args, _kwargs)
+        return val
+    def GetName(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_GetName,(self,) + _args, _kwargs)
+        return val
+    def GetColour(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_GetColour,(self,) + _args, _kwargs)
+        return val
+    def GetActualColourObject(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_GetActualColourObject,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 
+        return val
+    def GetFormattedText(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_GetFormattedText,(self,) + _args, _kwargs)
+        return val
+    def GetPenColour(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_GetPenColour,(self,) + _args, _kwargs)
+        return val
+    def GetPenStyle(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_GetPenStyle,(self,) + _args, _kwargs)
+        return val
+    def SetPenStyle(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_SetPenStyle,(self,) + _args, _kwargs)
+        return val
+    def SetPenColour(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_SetPenColour,(self,) + _args, _kwargs)
+        return val
+    def GetActualPen(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_GetActualPen,(self,) + _args, _kwargs)
+        if val: val = wxPenPtr(val) 
+        return val
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_GetWidth,(self,) + _args, _kwargs)
+        return val
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_GetHeight,(self,) + _args, _kwargs)
+        return val
+    def ClearText(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxShapeRegion_ClearText,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxShapeRegion instance at %s>" % (self.this,)
+class wxShapeRegion(wxShapeRegionPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(oglbasicc.new_wxShapeRegion,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxPyShapeEvtHandlerPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setSelf(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler__setSelf,(self,) + _args, _kwargs)
+        return val
+    def Destroy(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_Destroy,(self,) + _args, _kwargs)
+        return val
+    def SetShape(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_SetShape,(self,) + _args, _kwargs)
+        return val
+    def GetShape(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_GetShape,(self,) + _args, _kwargs)
+        if val: val = wxPyShapePtr(val) 
+        return val
+    def SetPreviousHandler(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_SetPreviousHandler,(self,) + _args, _kwargs)
+        return val
+    def GetPreviousHandler(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_GetPreviousHandler,(self,) + _args, _kwargs)
+        if val: val = wxPyShapeEvtHandlerPtr(val) 
+        return val
+    def CreateNewCopy(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_CreateNewCopy,(self,) + _args, _kwargs)
+        if val: val = wxPyShapeEvtHandlerPtr(val) 
+        return val
+    def base_OnDelete(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnDelete,(self,) + _args, _kwargs)
+        return val
+    def base_OnDraw(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnDraw,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawContents(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnDrawContents,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawBranches(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnDrawBranches,(self,) + _args, _kwargs)
+        return val
+    def base_OnMoveLinks(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnMoveLinks,(self,) + _args, _kwargs)
+        return val
+    def base_OnErase(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnErase,(self,) + _args, _kwargs)
+        return val
+    def base_OnEraseContents(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnEraseContents,(self,) + _args, _kwargs)
+        return val
+    def base_OnHighlight(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnHighlight,(self,) + _args, _kwargs)
+        return val
+    def base_OnLeftClick(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnLeftClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnLeftDoubleClick(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnLeftDoubleClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnRightClick(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnRightClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnSize(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnSize,(self,) + _args, _kwargs)
+        return val
+    def base_OnMovePre(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnMovePre,(self,) + _args, _kwargs)
+        return val
+    def base_OnMovePost(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnMovePost,(self,) + _args, _kwargs)
+        return val
+    def base_OnDragLeft(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginDragLeft(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnBeginDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndDragLeft(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnEndDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnDragRight(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginDragRight(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnBeginDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndDragRight(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnEndDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawOutline(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnDrawOutline,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawControlPoints(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnDrawControlPoints,(self,) + _args, _kwargs)
+        return val
+    def base_OnEraseControlPoints(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnEraseControlPoints,(self,) + _args, _kwargs)
+        return val
+    def base_OnMoveLink(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnMoveLink,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingDragLeft(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnSizingDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingBeginDragLeft(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnSizingBeginDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingEndDragLeft(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnSizingEndDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginSize(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnBeginSize,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndSize(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnEndSize,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxPyShapeEvtHandler instance at %s>" % (self.this,)
+class wxPyShapeEvtHandler(wxPyShapeEvtHandlerPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(oglbasicc.new_wxPyShapeEvtHandler,_args,_kwargs)
+        self.thisown = 1
+        self._setSelf(self, wxPyShapeEvtHandler)
+
+
+
+
+class wxPyShapePtr(wxPyShapeEvtHandlerPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setSelf(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape__setSelf,(self,) + _args, _kwargs)
+        return val
+    def Destroy(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_Destroy,(self,) + _args, _kwargs)
+        return val
+    def GetBoundingBoxMax(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetBoundingBoxMax,(self,) + _args, _kwargs)
+        return val
+    def GetBoundingBoxMin(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetBoundingBoxMin,(self,) + _args, _kwargs)
+        return val
+    def GetPerimeterPoint(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetPerimeterPoint,(self,) + _args, _kwargs)
+        return val
+    def GetCanvas(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetCanvas,(self,) + _args, _kwargs)
+        if val: val = wxPyShapeCanvasPtr(val) 
+        return val
+    def SetCanvas(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetCanvas,(self,) + _args, _kwargs)
+        return val
+    def AddToCanvas(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_AddToCanvas,(self,) + _args, _kwargs)
+        return val
+    def InsertInCanvas(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_InsertInCanvas,(self,) + _args, _kwargs)
+        return val
+    def RemoveFromCanvas(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_RemoveFromCanvas,(self,) + _args, _kwargs)
+        return val
+    def GetX(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetX,(self,) + _args, _kwargs)
+        return val
+    def GetY(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetY,(self,) + _args, _kwargs)
+        return val
+    def SetX(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetX,(self,) + _args, _kwargs)
+        return val
+    def SetY(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetY,(self,) + _args, _kwargs)
+        return val
+    def GetParent(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetParent,(self,) + _args, _kwargs)
+        if val: val = wxPyShapePtr(val) 
+        return val
+    def SetParent(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetParent,(self,) + _args, _kwargs)
+        return val
+    def GetTopAncestor(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetTopAncestor,(self,) + _args, _kwargs)
+        if val: val = wxPyShapePtr(val) 
+        return val
+    def GetChildren(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetChildren,(self,) + _args, _kwargs)
+        return val
+    def Unlink(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_Unlink,(self,) + _args, _kwargs)
+        return val
+    def SetDrawHandles(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetDrawHandles,(self,) + _args, _kwargs)
+        return val
+    def GetDrawHandles(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetDrawHandles,(self,) + _args, _kwargs)
+        return val
+    def MakeControlPoints(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_MakeControlPoints,(self,) + _args, _kwargs)
+        return val
+    def DeleteControlPoints(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_DeleteControlPoints,(self,) + _args, _kwargs)
+        return val
+    def ResetControlPoints(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_ResetControlPoints,(self,) + _args, _kwargs)
+        return val
+    def GetEventHandler(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetEventHandler,(self,) + _args, _kwargs)
+        if val: val = wxPyShapeEvtHandlerPtr(val) 
+        return val
+    def SetEventHandler(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetEventHandler,(self,) + _args, _kwargs)
+        return val
+    def MakeMandatoryControlPoints(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_MakeMandatoryControlPoints,(self,) + _args, _kwargs)
+        return val
+    def ResetMandatoryControlPoints(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_ResetMandatoryControlPoints,(self,) + _args, _kwargs)
+        return val
+    def Recompute(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_Recompute,(self,) + _args, _kwargs)
+        return val
+    def CalculateSize(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_CalculateSize,(self,) + _args, _kwargs)
+        return val
+    def Select(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_Select,(self,) + _args, _kwargs)
+        return val
+    def SetHighlight(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetHighlight,(self,) + _args, _kwargs)
+        return val
+    def IsHighlighted(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_IsHighlighted,(self,) + _args, _kwargs)
+        return val
+    def Selected(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_Selected,(self,) + _args, _kwargs)
+        return val
+    def AncestorSelected(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_AncestorSelected,(self,) + _args, _kwargs)
+        return val
+    def SetSensitivityFilter(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetSensitivityFilter,(self,) + _args, _kwargs)
+        return val
+    def GetSensitivityFilter(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetSensitivityFilter,(self,) + _args, _kwargs)
+        return val
+    def SetDraggable(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetDraggable,(self,) + _args, _kwargs)
+        return val
+    def SetFixedSize(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetFixedSize,(self,) + _args, _kwargs)
+        return val
+    def GetFixedSize(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetFixedSize,(self,) + _args, _kwargs)
+        return val
+    def GetFixedWidth(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetFixedWidth,(self,) + _args, _kwargs)
+        return val
+    def GetFixedHeight(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetFixedHeight,(self,) + _args, _kwargs)
+        return val
+    def SetSpaceAttachments(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetSpaceAttachments,(self,) + _args, _kwargs)
+        return val
+    def GetSpaceAttachments(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetSpaceAttachments,(self,) + _args, _kwargs)
+        return val
+    def SetShadowMode(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetShadowMode,(self,) + _args, _kwargs)
+        return val
+    def GetShadowMode(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetShadowMode,(self,) + _args, _kwargs)
+        return val
+    def HitTest(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_HitTest,(self,) + _args, _kwargs)
+        return val
+    def SetCentreResize(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetCentreResize,(self,) + _args, _kwargs)
+        return val
+    def GetCentreResize(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetCentreResize,(self,) + _args, _kwargs)
+        return val
+    def SetMaintainAspectRatio(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetMaintainAspectRatio,(self,) + _args, _kwargs)
+        return val
+    def GetMaintainAspectRatio(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetMaintainAspectRatio,(self,) + _args, _kwargs)
+        return val
+    def GetLines(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetLines,(self,) + _args, _kwargs)
+        return val
+    def SetDisableLabel(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetDisableLabel,(self,) + _args, _kwargs)
+        return val
+    def GetDisableLabel(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetDisableLabel,(self,) + _args, _kwargs)
+        return val
+    def SetAttachmentMode(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetAttachmentMode,(self,) + _args, _kwargs)
+        return val
+    def GetAttachmentMode(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetAttachmentMode,(self,) + _args, _kwargs)
+        return val
+    def SetId(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetId,(self,) + _args, _kwargs)
+        return val
+    def GetId(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetId,(self,) + _args, _kwargs)
+        return val
+    def SetPen(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetPen,(self,) + _args, _kwargs)
+        return val
+    def SetBrush(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetBrush,(self,) + _args, _kwargs)
+        return val
+    def SetClientData(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetClientData,(self,) + _args, _kwargs)
+        return val
+    def GetClientData(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetClientData,(self,) + _args, _kwargs)
+        return val
+    def Show(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_Show,(self,) + _args, _kwargs)
+        return val
+    def IsShown(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_IsShown,(self,) + _args, _kwargs)
+        return val
+    def Move(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_Move,(self,) + _args, _kwargs)
+        return val
+    def Erase(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_Erase,(self,) + _args, _kwargs)
+        return val
+    def EraseContents(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_EraseContents,(self,) + _args, _kwargs)
+        return val
+    def Draw(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_Draw,(self,) + _args, _kwargs)
+        return val
+    def Flash(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_Flash,(self,) + _args, _kwargs)
+        return val
+    def MoveLinks(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_MoveLinks,(self,) + _args, _kwargs)
+        return val
+    def DrawContents(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_DrawContents,(self,) + _args, _kwargs)
+        return val
+    def SetSize(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetSize,(self,) + _args, _kwargs)
+        return val
+    def SetAttachmentSize(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetAttachmentSize,(self,) + _args, _kwargs)
+        return val
+    def Attach(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_Attach,(self,) + _args, _kwargs)
+        return val
+    def Detach(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_Detach,(self,) + _args, _kwargs)
+        return val
+    def Constrain(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_Constrain,(self,) + _args, _kwargs)
+        return val
+    def AddLine(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_AddLine,(self,) + _args, _kwargs)
+        return val
+    def GetLinePosition(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetLinePosition,(self,) + _args, _kwargs)
+        return val
+    def AddText(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_AddText,(self,) + _args, _kwargs)
+        return val
+    def GetPen(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetPen,(self,) + _args, _kwargs)
+        if val: val = wxPenPtr(val) 
+        return val
+    def GetBrush(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetBrush,(self,) + _args, _kwargs)
+        if val: val = wxBrushPtr(val) 
+        return val
+    def SetDefaultRegionSize(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetDefaultRegionSize,(self,) + _args, _kwargs)
+        return val
+    def FormatText(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_FormatText,(self,) + _args, _kwargs)
+        return val
+    def SetFormatMode(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetFormatMode,(self,) + _args, _kwargs)
+        return val
+    def GetFormatMode(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetFormatMode,(self,) + _args, _kwargs)
+        return val
+    def SetFont(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetFont,(self,) + _args, _kwargs)
+        return val
+    def GetFont(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetFont,(self,) + _args, _kwargs)
+        if val: val = wxFontPtr(val) 
+        return val
+    def SetTextColour(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetTextColour,(self,) + _args, _kwargs)
+        return val
+    def GetTextColour(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetTextColour,(self,) + _args, _kwargs)
+        return val
+    def GetNumberOfTextRegions(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetNumberOfTextRegions,(self,) + _args, _kwargs)
+        return val
+    def SetRegionName(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetRegionName,(self,) + _args, _kwargs)
+        return val
+    def GetRegionName(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetRegionName,(self,) + _args, _kwargs)
+        return val
+    def GetRegionId(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetRegionId,(self,) + _args, _kwargs)
+        return val
+    def NameRegions(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_NameRegions,(self,) + _args, _kwargs)
+        return val
+    def GetRegions(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetRegions,(self,) + _args, _kwargs)
+        return val
+    def AddRegion(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_AddRegion,(self,) + _args, _kwargs)
+        return val
+    def ClearRegions(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_ClearRegions,(self,) + _args, _kwargs)
+        return val
+    def AssignNewIds(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_AssignNewIds,(self,) + _args, _kwargs)
+        return val
+    def FindRegion(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_FindRegion,(self,) + _args, _kwargs)
+        return val
+    def FindRegionNames(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_FindRegionNames,(self,) + _args, _kwargs)
+        return val
+    def ClearText(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_ClearText,(self,) + _args, _kwargs)
+        return val
+    def RemoveLine(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_RemoveLine,(self,) + _args, _kwargs)
+        return val
+    def GetAttachmentPosition(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetAttachmentPosition,(self,) + _args, _kwargs)
+        return val
+    def GetNumberOfAttachments(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetNumberOfAttachments,(self,) + _args, _kwargs)
+        return val
+    def AttachmentIsValid(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_AttachmentIsValid,(self,) + _args, _kwargs)
+        return val
+    def GetAttachmentPositionEdge(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetAttachmentPositionEdge,(self,) + _args, _kwargs)
+        return val
+    def CalcSimpleAttachment(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_CalcSimpleAttachment,(self,) + _args, _kwargs)
+        if val: val = wxRealPointPtr(val) ; val.thisown = 1
+        return val
+    def AttachmentSortTest(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_AttachmentSortTest,(self,) + _args, _kwargs)
+        return val
+    def EraseLinks(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_EraseLinks,(self,) + _args, _kwargs)
+        return val
+    def DrawLinks(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_DrawLinks,(self,) + _args, _kwargs)
+        return val
+    def MoveLineToNewAttachment(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_MoveLineToNewAttachment,(self,) + _args, _kwargs)
+        return val
+    def ApplyAttachmentOrdering(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_ApplyAttachmentOrdering,(self,) + _args, _kwargs)
+        return val
+    def GetBranchingAttachmentRoot(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetBranchingAttachmentRoot,(self,) + _args, _kwargs)
+        if val: val = wxRealPointPtr(val) ; val.thisown = 1
+        return val
+    def GetBranchingAttachmentInfo(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetBranchingAttachmentInfo,(self,) + _args, _kwargs)
+        return val
+    def GetBranchingAttachmentPoint(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetBranchingAttachmentPoint,(self,) + _args, _kwargs)
+        return val
+    def GetAttachmentLineCount(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetAttachmentLineCount,(self,) + _args, _kwargs)
+        return val
+    def SetBranchNeckLength(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetBranchNeckLength,(self,) + _args, _kwargs)
+        return val
+    def GetBranchNeckLength(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetBranchNeckLength,(self,) + _args, _kwargs)
+        return val
+    def SetBranchStemLength(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetBranchStemLength,(self,) + _args, _kwargs)
+        return val
+    def GetBranchStemLength(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetBranchStemLength,(self,) + _args, _kwargs)
+        return val
+    def SetBranchSpacing(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetBranchSpacing,(self,) + _args, _kwargs)
+        return val
+    def GetBranchSpacing(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetBranchSpacing,(self,) + _args, _kwargs)
+        return val
+    def SetBranchStyle(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_SetBranchStyle,(self,) + _args, _kwargs)
+        return val
+    def GetBranchStyle(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetBranchStyle,(self,) + _args, _kwargs)
+        return val
+    def PhysicalToLogicalAttachment(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_PhysicalToLogicalAttachment,(self,) + _args, _kwargs)
+        return val
+    def LogicalToPhysicalAttachment(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_LogicalToPhysicalAttachment,(self,) + _args, _kwargs)
+        return val
+    def Draggable(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_Draggable,(self,) + _args, _kwargs)
+        return val
+    def HasDescendant(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_HasDescendant,(self,) + _args, _kwargs)
+        return val
+    def CreateNewCopy(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_CreateNewCopy,(self,) + _args, _kwargs)
+        if val: val = wxPyShapePtr(val) 
+        return val
+    def Copy(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_Copy,(self,) + _args, _kwargs)
+        return val
+    def CopyWithHandler(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_CopyWithHandler,(self,) + _args, _kwargs)
+        return val
+    def Rotate(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_Rotate,(self,) + _args, _kwargs)
+        return val
+    def GetRotation(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_GetRotation,(self,) + _args, _kwargs)
+        return val
+    def ClearAttachments(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_ClearAttachments,(self,) + _args, _kwargs)
+        return val
+    def Recentre(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_Recentre,(self,) + _args, _kwargs)
+        return val
+    def ClearPointList(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_ClearPointList,(self,) + _args, _kwargs)
+        return val
+    def base_OnDelete(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnDelete,(self,) + _args, _kwargs)
+        return val
+    def base_OnDraw(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnDraw,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawContents(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnDrawContents,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawBranches(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnDrawBranches,(self,) + _args, _kwargs)
+        return val
+    def base_OnMoveLinks(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnMoveLinks,(self,) + _args, _kwargs)
+        return val
+    def base_OnErase(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnErase,(self,) + _args, _kwargs)
+        return val
+    def base_OnEraseContents(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnEraseContents,(self,) + _args, _kwargs)
+        return val
+    def base_OnHighlight(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnHighlight,(self,) + _args, _kwargs)
+        return val
+    def base_OnLeftClick(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnLeftClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnLeftDoubleClick(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnLeftDoubleClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnRightClick(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnRightClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnSize(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnSize,(self,) + _args, _kwargs)
+        return val
+    def base_OnMovePre(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnMovePre,(self,) + _args, _kwargs)
+        return val
+    def base_OnMovePost(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnMovePost,(self,) + _args, _kwargs)
+        return val
+    def base_OnDragLeft(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginDragLeft(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnBeginDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndDragLeft(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnEndDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnDragRight(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginDragRight(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnBeginDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndDragRight(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnEndDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawOutline(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnDrawOutline,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawControlPoints(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnDrawControlPoints,(self,) + _args, _kwargs)
+        return val
+    def base_OnEraseControlPoints(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnEraseControlPoints,(self,) + _args, _kwargs)
+        return val
+    def base_OnMoveLink(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnMoveLink,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingDragLeft(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnSizingDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingBeginDragLeft(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnSizingBeginDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingEndDragLeft(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnSizingEndDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginSize(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnBeginSize,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndSize(self, *_args, **_kwargs):
+        val = apply(oglbasicc.wxPyShape_base_OnEndSize,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxPyShape instance at %s>" % (self.this,)
+class wxPyShape(wxPyShapePtr):
+    def __init__(self,this):
+        self.this = this
+
+
+
+
+
+
+#-------------- FUNCTION WRAPPERS ------------------
+
+
+
+#-------------- VARIABLE WRAPPERS ------------------
+

wxPython/contrib/ogl/oglc.def

@@ -0,0 +1,2 @@
+EXPORTS
+  initoglc

wxPython/contrib/ogl/oglcanvas.i

@@ -0,0 +1,157 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        oglcanvas.i
+// Purpose:     SWIG definitions for the wxWindows Object Graphics Library
+//
+// Author:      Robin Dunn
+//
+// Created:     7-Sept-1999
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 by Total Control Software
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+
+%module oglcanvas
+
+%{
+#include "helpers.h"
+#include "oglhelpers.h"
+%}
+
+//---------------------------------------------------------------------------
+
+%include typemaps.i
+%include my_typemaps.i
+
+%extern wx.i
+%import windows.i
+%extern _defs.i
+%extern misc.i
+%extern gdi.i
+
+%include _ogldefs.i
+
+%extern oglbasic.i
+
+
+%pragma(python) code = "import wx"
+
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+
+class wxDiagram {
+public:
+    wxDiagram();
+    ~wxDiagram();
+
+    void AddShape(wxPyShape*shape, wxPyShape *addAfter = NULL);
+    void Clear(wxDC& dc);
+    void DeleteAllShapes();
+    void DrawOutline(wxDC& dc, double x1, double y1, double x2, double y2);
+    wxPyShape* FindShape(long id);
+    wxPyShapeCanvas* GetCanvas();
+    int GetCount();
+    double GetGridSpacing();
+    int GetMouseTolerance();
+
+    // wxList* GetShapeList();
+    %addmethods {
+        PyObject* GetShapeList() {
+            wxList* list = self->GetShapeList();
+            return wxPy_ConvertList(list, "wxPyShape");
+        }
+    }
+
+    bool GetQuickEditMode();
+    bool GetSnapToGrid();
+    void InsertShape(wxPyShape *shape);
+    bool LoadFile(const wxString& filename);
+
+    // **** Have to deal with wxExpr and wxExprDatabase first...
+    //void OnDatabaseLoad(wxExprDatabase& database);
+    //void OnDatabaseSave(wxExprDatabase& database);
+    //bool OnHeaderLoad(wxExprDatabase& database, wxExpr& expr);
+    //bool OnHeaderSave(wxExprDatabase& database, wxExpr& expr);
+    //bool OnShapeLoad(wxExprDatabase& database, wxPyShape& shape, wxExpr& expr);
+    //bool OnShapeSave(wxExprDatabase& database, wxPyShape& shape, wxExpr& expr);
+
+
+    void ReadContainerGeometry(wxExprDatabase& database);
+    void ReadLines(wxExprDatabase& database);
+    void ReadNodes(wxExprDatabase& database);
+    void RecentreAll(wxDC& dc);
+    void Redraw(wxDC& dc);
+    void RemoveAllShapes();
+    void RemoveShape(wxPyShape* shape);
+    bool SaveFile(const wxString& filename);
+    void SetCanvas(wxPyShapeCanvas* canvas);
+    void SetGridSpacing(double spacing);
+    void SetMouseTolerance(int tolerance);
+    void SetQuickEditMode(bool mode);
+    void SetSnapToGrid(bool snap);
+    void ShowAll(bool show);
+    void Snap(double *OUTPUT, double *OUTPUT);
+
+};
+
+//---------------------------------------------------------------------------
+
+%{
+    IMP_PYCALLBACK__2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnBeginDragLeft);
+    IMP_PYCALLBACK__2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnBeginDragRight);
+    IMP_PYCALLBACK__2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnEndDragLeft);
+    IMP_PYCALLBACK__2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnEndDragRight);
+    IMP_PYCALLBACK__BOOL2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnDragLeft);
+    IMP_PYCALLBACK__BOOL2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnDragRight);
+    IMP_PYCALLBACK__2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnLeftClick);
+    IMP_PYCALLBACK__2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnRightClick);
+%}
+
+
+class wxPyShapeCanvas : public wxScrolledWindow {
+public:
+    wxPyShapeCanvas(wxWindow* parent = NULL, wxWindowID id = -1,
+                    const wxPoint& pos = wxPyDefaultPosition,
+                    const wxSize& size = wxPyDefaultSize,
+                    long style = wxBORDER);
+
+    void _setSelf(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyShapeCanvas)"
+
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:wx._StdOnScrollCallbacks(self)"
+
+    void AddShape(wxPyShape *shape, wxPyShape *addAfter = NULL);
+
+    // ****  Need a typemap for wxClassInfo, or implement wxObject, etc.....
+    wxPyShape* FindShape(double x1, double y, int *OUTPUT,
+                       wxClassInfo *info = NULL, wxPyShape* notImage = NULL);
+
+    wxPyShape * FindFirstSensitiveShape(double x1, double y, int *OUTPUT, int op);
+    wxDiagram* GetDiagram();
+
+    bool GetQuickEditMode();
+    void InsertShape(wxPyShape* shape);
+
+
+    void base_OnBeginDragLeft(double x, double y, int keys = 0);
+    void base_OnBeginDragRight(double x, double y, int keys = 0);
+    void base_OnEndDragLeft(double x, double y, int keys = 0);
+    void base_OnEndDragRight(double x, double y, int keys = 0);
+    void base_OnDragLeft(bool draw, double x, double y, int keys = 0);
+    void base_OnDragRight(bool draw, double x, double y, int keys = 0);
+    void base_OnLeftClick(double x, double y, int keys = 0);
+    void base_OnRightClick(double x, double y, int keys = 0);
+
+    void Redraw(wxDC& dc);
+    void RemoveShape(wxPyShape *shape);
+    void SetDiagram(wxDiagram *diagram);
+    void Snap(double *OUTPUT, double *OUTPUT);
+
+};
+
+
+//---------------------------------------------------------------------------
+
+

wxPython/contrib/ogl/oglcanvas.py

@@ -0,0 +1,226 @@
+# This file was created automatically by SWIG.
+import oglcanvasc
+
+from misc import *
+
+from misc2 import *
+
+from windows import *
+
+from gdi import *
+
+from clip_dnd import *
+
+from events import *
+
+from mdi import *
+
+from frames import *
+
+from stattool import *
+
+from controls import *
+
+from controls2 import *
+
+from windows2 import *
+
+from cmndlgs import *
+
+from windows3 import *
+
+from image import *
+
+from printfw import *
+
+from sizers import *
+import wx
+class wxDiagramPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,oglcanvasc=oglcanvasc):
+        if self.thisown == 1 :
+            oglcanvasc.delete_wxDiagram(self)
+    def AddShape(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_AddShape,(self,) + _args, _kwargs)
+        return val
+    def Clear(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_Clear,(self,) + _args, _kwargs)
+        return val
+    def DeleteAllShapes(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_DeleteAllShapes,(self,) + _args, _kwargs)
+        return val
+    def DrawOutline(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_DrawOutline,(self,) + _args, _kwargs)
+        return val
+    def FindShape(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_FindShape,(self,) + _args, _kwargs)
+        if val: val = wxPyShapePtr(val) 
+        return val
+    def GetCanvas(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_GetCanvas,(self,) + _args, _kwargs)
+        if val: val = wxPyShapeCanvasPtr(val) 
+        return val
+    def GetCount(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_GetCount,(self,) + _args, _kwargs)
+        return val
+    def GetGridSpacing(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_GetGridSpacing,(self,) + _args, _kwargs)
+        return val
+    def GetMouseTolerance(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_GetMouseTolerance,(self,) + _args, _kwargs)
+        return val
+    def GetShapeList(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_GetShapeList,(self,) + _args, _kwargs)
+        return val
+    def GetQuickEditMode(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_GetQuickEditMode,(self,) + _args, _kwargs)
+        return val
+    def GetSnapToGrid(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_GetSnapToGrid,(self,) + _args, _kwargs)
+        return val
+    def InsertShape(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_InsertShape,(self,) + _args, _kwargs)
+        return val
+    def LoadFile(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_LoadFile,(self,) + _args, _kwargs)
+        return val
+    def ReadContainerGeometry(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_ReadContainerGeometry,(self,) + _args, _kwargs)
+        return val
+    def ReadLines(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_ReadLines,(self,) + _args, _kwargs)
+        return val
+    def ReadNodes(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_ReadNodes,(self,) + _args, _kwargs)
+        return val
+    def RecentreAll(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_RecentreAll,(self,) + _args, _kwargs)
+        return val
+    def Redraw(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_Redraw,(self,) + _args, _kwargs)
+        return val
+    def RemoveAllShapes(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_RemoveAllShapes,(self,) + _args, _kwargs)
+        return val
+    def RemoveShape(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_RemoveShape,(self,) + _args, _kwargs)
+        return val
+    def SaveFile(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_SaveFile,(self,) + _args, _kwargs)
+        return val
+    def SetCanvas(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_SetCanvas,(self,) + _args, _kwargs)
+        return val
+    def SetGridSpacing(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_SetGridSpacing,(self,) + _args, _kwargs)
+        return val
+    def SetMouseTolerance(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_SetMouseTolerance,(self,) + _args, _kwargs)
+        return val
+    def SetQuickEditMode(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_SetQuickEditMode,(self,) + _args, _kwargs)
+        return val
+    def SetSnapToGrid(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_SetSnapToGrid,(self,) + _args, _kwargs)
+        return val
+    def ShowAll(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_ShowAll,(self,) + _args, _kwargs)
+        return val
+    def Snap(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxDiagram_Snap,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxDiagram instance at %s>" % (self.this,)
+class wxDiagram(wxDiagramPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(oglcanvasc.new_wxDiagram,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxPyShapeCanvasPtr(wxScrolledWindowPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setSelf(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxPyShapeCanvas__setSelf,(self,) + _args, _kwargs)
+        return val
+    def AddShape(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxPyShapeCanvas_AddShape,(self,) + _args, _kwargs)
+        return val
+    def FindShape(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxPyShapeCanvas_FindShape,(self,) + _args, _kwargs)
+        return val
+    def FindFirstSensitiveShape(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxPyShapeCanvas_FindFirstSensitiveShape,(self,) + _args, _kwargs)
+        return val
+    def GetDiagram(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxPyShapeCanvas_GetDiagram,(self,) + _args, _kwargs)
+        if val: val = wxDiagramPtr(val) 
+        return val
+    def GetQuickEditMode(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxPyShapeCanvas_GetQuickEditMode,(self,) + _args, _kwargs)
+        return val
+    def InsertShape(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxPyShapeCanvas_InsertShape,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginDragLeft(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxPyShapeCanvas_base_OnBeginDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginDragRight(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxPyShapeCanvas_base_OnBeginDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndDragLeft(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxPyShapeCanvas_base_OnEndDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndDragRight(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxPyShapeCanvas_base_OnEndDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnDragLeft(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxPyShapeCanvas_base_OnDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnDragRight(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxPyShapeCanvas_base_OnDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnLeftClick(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxPyShapeCanvas_base_OnLeftClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnRightClick(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxPyShapeCanvas_base_OnRightClick,(self,) + _args, _kwargs)
+        return val
+    def Redraw(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxPyShapeCanvas_Redraw,(self,) + _args, _kwargs)
+        return val
+    def RemoveShape(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxPyShapeCanvas_RemoveShape,(self,) + _args, _kwargs)
+        return val
+    def SetDiagram(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxPyShapeCanvas_SetDiagram,(self,) + _args, _kwargs)
+        return val
+    def Snap(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxPyShapeCanvas_Snap,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxPyShapeCanvas instance at %s>" % (self.this,)
+class wxPyShapeCanvas(wxPyShapeCanvasPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(oglcanvasc.new_wxPyShapeCanvas,_args,_kwargs)
+        self.thisown = 1
+        self._setSelf(self, wxPyShapeCanvas)
+        wx._StdWindowCallbacks(self)
+        wx._StdOnScrollCallbacks(self)
+
+
+
+
+
+
+#-------------- FUNCTION WRAPPERS ------------------
+
+
+
+#-------------- VARIABLE WRAPPERS ------------------
+

wxPython/contrib/ogl/oglhelpers.cpp

@@ -0,0 +1,103 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        oglhelpers.cpp
+// Purpose:     Some Helper functions to help in data conversions in OGL
+//
+// Author:      Robin Dunn
+//
+// Created:     3-Sept-1999
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 by Total Control Software
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+#include "helpers.h"
+
+//---------------------------------------------------------------------------
+// This one will work for any class for the VERY generic cases, but beyond that
+// the helper needs to know more about the type.
+
+wxList* wxPy_wxListHelper(PyObject* pyList, char* className) {
+    bool doSave = wxPyRestoreThread();
+    if (!PyList_Check(pyList)) {
+        PyErr_SetString(PyExc_TypeError, "Expected a list object.");
+        wxPySaveThread(doSave);
+        return NULL;
+    }
+    int count = PyList_Size(pyList);
+    wxList* list = new wxList;
+    if (! list) {
+        PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");
+        wxPySaveThread(doSave);
+        return NULL;
+    }
+    for (int x=0; x<count; x++) {
+        PyObject* pyo = PyList_GetItem(pyList, x);
+        wxObject* wxo = NULL;
+
+        if (SWIG_GetPtrObj(pyo, (void **)&wxo, className)) {
+            char errmsg[1024];
+            sprintf(errmsg, "Type error, expected list of %s objects", className);
+            PyErr_SetString(PyExc_TypeError, errmsg);
+            wxPySaveThread(doSave);
+            return NULL;
+        }
+        list->Append(wxo);
+    }
+    wxPySaveThread(doSave);
+    return list;
+}
+
+//---------------------------------------------------------------------------
+
+wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
+    bool doSave = wxPyRestoreThread();
+    if (!PyList_Check(pyList)) {
+        PyErr_SetString(PyExc_TypeError, "Expected a list object.");
+        wxPySaveThread(doSave);
+        return NULL;
+    }
+    int count = PyList_Size(pyList);
+    wxList* list = new wxList;
+    if (! list) {
+        PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");
+        wxPySaveThread(doSave);
+        return NULL;
+    }
+    for (int x=0; x<count; x++) {
+        PyObject* pyo = PyList_GetItem(pyList, x);
+
+        if (PyTuple_Check(pyo)) {
+            PyObject* o1 = PyNumber_Float(PyTuple_GetItem(pyo, 0));
+            PyObject* o2 = PyNumber_Float(PyTuple_GetItem(pyo, 1));
+
+            double val1 = (o1 ? PyFloat_AsDouble(o1) : 0.0);
+            double val2 = (o2 ? PyFloat_AsDouble(o2) : 0.0);
+
+            list->Append((wxObject*) new wxRealPoint(val1, val2));
+
+        } else {
+            wxRealPoint* wxo = NULL;
+            if (SWIG_GetPtrObj(pyo, (void **)&wxo, "_wxRealPoint_p")) {
+                PyErr_SetString(PyExc_TypeError, "Type error, expected list of wxRealPoint objects or 2-tuples");
+                wxPySaveThread(doSave);
+                return NULL;
+            }
+            list->Append((wxObject*) new wxRealPoint(*wxo));
+        }
+    }
+    wxPySaveThread(doSave);
+    return list;
+}
+
+
+//---------------------------------------------------------------------------
+
+
+
+
+
+
+
+
+

wxPython/contrib/ogl/oglhelpers.h

@@ -0,0 +1,262 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        oglhelpers.h
+// Purpose:     Some Helper functions to help in data conversions in OGL
+//
+// Author:      Robin Dunn
+//
+// Created:     9-Sept-1999
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 by Total Control Software
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __wxp_ogl_helpers__
+#define __wxp_ogl_helpers__
+
+
+#include <wx/ogl/ogl.h>
+#include <wx/ogl/basicp.h>
+#include <wx/ogl/constrnt.h>
+#include <wx/ogl/bmpshape.h>
+#include <wx/ogl/drawn.h>
+
+
+//---------------------------------------------------------------------------
+// Define a macro that will be used in the class definintions below
+
+#define WXSHAPE_DEC_CALLBACKS()       \
+    DEC_PYCALLBACK__                (OnDelete);             \
+    DEC_PYCALLBACK__DC              (OnDraw);               \
+    DEC_PYCALLBACK__DC              (OnDrawContents);       \
+    DEC_PYCALLBACK__DCBOOL          (OnDrawBranches);       \
+    DEC_PYCALLBACK__DC              (OnMoveLinks);          \
+    DEC_PYCALLBACK__DC              (OnErase);              \
+    DEC_PYCALLBACK__DC              (OnEraseContents);      \
+    DEC_PYCALLBACK__DC              (OnHighlight);          \
+    DEC_PYCALLBACK__2DBL2INT        (OnLeftClick);          \
+    DEC_PYCALLBACK__2DBL2INT        (OnLeftDoubleClick);    \
+    DEC_PYCALLBACK__2DBL2INT        (OnRightClick);         \
+    DEC_PYCALLBACK__2DBL            (OnSize);               \
+    DEC_PYCALLBACK_BOOL_DC4DBLBOOL  (OnMovePre);            \
+    DEC_PYCALLBACK__DC4DBLBOOL      (OnMovePost);           \
+    DEC_PYCALLBACK__BOOL2DBL2INT    (OnDragLeft);           \
+    DEC_PYCALLBACK__2DBL2INT        (OnBeginDragLeft);      \
+    DEC_PYCALLBACK__2DBL2INT        (OnEndDragLeft);        \
+    DEC_PYCALLBACK__BOOL2DBL2INT    (OnDragRight);          \
+    DEC_PYCALLBACK__2DBL2INT        (OnBeginDragRight);     \
+    DEC_PYCALLBACK__2DBL2INT        (OnEndDragRight);       \
+    DEC_PYCALLBACK__DC4DBL          (OnDrawOutline);        \
+    DEC_PYCALLBACK__DC              (OnDrawControlPoints);  \
+    DEC_PYCALLBACK__DC              (OnEraseControlPoints); \
+    DEC_PYCALLBACK__DCBOOL          (OnMoveLink);           \
+    DEC_PYCALLBACK__WXCPBOOL2DBL2INT(OnSizingDragLeft);     \
+    DEC_PYCALLBACK__WXCP2DBL2INT    (OnSizingBeginDragLeft);\
+    DEC_PYCALLBACK__WXCP2DBL2INT    (OnSizingEndDragLeft);  \
+    DEC_PYCALLBACK__2DBL            (OnBeginSize);          \
+    DEC_PYCALLBACK__2DBL            (OnEndSize);            \
+                                                            \
+    PYPRIVATE;
+
+
+#define WXSHAPE_IMP_CALLBACKS(CLASS, PARENT)       \
+    IMP_PYCALLBACK__                (CLASS, PARENT,  OnDelete);             \
+    IMP_PYCALLBACK__DC              (CLASS, PARENT,  OnDraw);               \
+    IMP_PYCALLBACK__DC              (CLASS, PARENT,  OnDrawContents);       \
+    IMP_PYCALLBACK__DCBOOL          (CLASS, PARENT,  OnDrawBranches);       \
+    IMP_PYCALLBACK__DC              (CLASS, PARENT,  OnMoveLinks);          \
+    IMP_PYCALLBACK__DC              (CLASS, PARENT,  OnErase);              \
+    IMP_PYCALLBACK__DC              (CLASS, PARENT,  OnEraseContents);      \
+    IMP_PYCALLBACK__DC              (CLASS, PARENT,  OnHighlight);          \
+    IMP_PYCALLBACK__2DBL2INT        (CLASS, PARENT,  OnLeftClick);          \
+    IMP_PYCALLBACK__2DBL2INT        (CLASS, PARENT,  OnLeftDoubleClick);    \
+    IMP_PYCALLBACK__2DBL2INT        (CLASS, PARENT,  OnRightClick);         \
+    IMP_PYCALLBACK__2DBL            (CLASS, PARENT,  OnSize);               \
+    IMP_PYCALLBACK_BOOL_DC4DBLBOOL  (CLASS, PARENT,  OnMovePre);            \
+    IMP_PYCALLBACK__DC4DBLBOOL      (CLASS, PARENT,  OnMovePost);           \
+    IMP_PYCALLBACK__BOOL2DBL2INT    (CLASS, PARENT,  OnDragLeft);           \
+    IMP_PYCALLBACK__2DBL2INT        (CLASS, PARENT,  OnBeginDragLeft);      \
+    IMP_PYCALLBACK__2DBL2INT        (CLASS, PARENT,  OnEndDragLeft);        \
+    IMP_PYCALLBACK__BOOL2DBL2INT    (CLASS, PARENT,  OnDragRight);          \
+    IMP_PYCALLBACK__2DBL2INT        (CLASS, PARENT,  OnBeginDragRight);     \
+    IMP_PYCALLBACK__2DBL2INT        (CLASS, PARENT,  OnEndDragRight);       \
+    IMP_PYCALLBACK__DC4DBL          (CLASS, PARENT,  OnDrawOutline);        \
+    IMP_PYCALLBACK__DC              (CLASS, PARENT,  OnDrawControlPoints);  \
+    IMP_PYCALLBACK__DC              (CLASS, PARENT,  OnEraseControlPoints); \
+    IMP_PYCALLBACK__DCBOOL          (CLASS, PARENT,  OnMoveLink);           \
+    IMP_PYCALLBACK__WXCPBOOL2DBL2INT(CLASS, PARENT,  OnSizingDragLeft);     \
+    IMP_PYCALLBACK__WXCP2DBL2INT    (CLASS, PARENT,  OnSizingBeginDragLeft);\
+    IMP_PYCALLBACK__WXCP2DBL2INT    (CLASS, PARENT,  OnSizingEndDragLeft);  \
+    IMP_PYCALLBACK__2DBL            (CLASS, PARENT,  OnBeginSize);          \
+    IMP_PYCALLBACK__2DBL            (CLASS, PARENT,  OnEndSize);            \
+
+
+    //  This one may be difficult...
+    //PYCALLBACK__???????       (PARENT,  OnChangeAttachment);
+
+
+
+//---------------------------------------------------------------------------
+// These are prototypes of some helper functions found in oglhelpers.cpp
+
+wxList* wxPy_wxListHelper(PyObject* pyList, char* className);
+wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList);
+
+
+
+//---------------------------------------------------------------------------
+// Classes that derive from the shapes and such, but which know how to turn
+// virtual callbacks into Python callbacks.
+
+class wxPyShapeCanvas : public wxShapeCanvas {
+public:
+    wxPyShapeCanvas(wxWindow* parent = NULL, wxWindowID id = -1,
+                    const wxPoint& pos = wxPyDefaultPosition,
+                    const wxSize& size = wxPyDefaultSize,
+                    long style = wxBORDER)
+        : wxShapeCanvas(parent, id, pos, size, style) {}
+
+    DEC_PYCALLBACK__2DBLINT(OnBeginDragLeft);
+    DEC_PYCALLBACK__2DBLINT(OnBeginDragRight);
+    DEC_PYCALLBACK__2DBLINT(OnEndDragLeft);
+    DEC_PYCALLBACK__2DBLINT(OnEndDragRight);
+    DEC_PYCALLBACK__BOOL2DBLINT(OnDragLeft);
+    DEC_PYCALLBACK__BOOL2DBLINT(OnDragRight);
+    DEC_PYCALLBACK__2DBLINT(OnLeftClick);
+    DEC_PYCALLBACK__2DBLINT(OnRightClick);
+
+    PYPRIVATE;
+};
+
+
+
+class wxPyShapeEvtHandler : public wxShapeEvtHandler {
+public:
+    wxPyShapeEvtHandler(wxShapeEvtHandler *prev = NULL, wxShape *shape = NULL)
+        : wxShapeEvtHandler(prev, shape) {}
+
+    WXSHAPE_DEC_CALLBACKS();
+};
+
+
+class wxPyShape : public wxShape {
+public:
+    wxPyShape(wxPyShapeCanvas *can = NULL)
+        : wxShape(can) {}
+
+    WXSHAPE_DEC_CALLBACKS();
+
+};
+
+
+class wxPyRectangleShape : public wxRectangleShape {
+public:
+    wxPyRectangleShape(double width = 0.0, double height = 0.0)
+        : wxRectangleShape(width, height) {}
+
+    WXSHAPE_DEC_CALLBACKS();
+};
+
+class wxPyControlPoint : public wxControlPoint {
+public:
+    wxPyControlPoint(wxPyShapeCanvas *the_canvas = NULL,
+                     wxPyShape *object = NULL,
+                     double size = 0.0, double the_xoffset = 0.0,
+                     double the_yoffset = 0.0, int the_type = 0)
+        : wxControlPoint(the_canvas, object, size,
+                         the_xoffset, the_yoffset, the_type) {}
+
+    WXSHAPE_DEC_CALLBACKS();
+};
+
+
+
+class wxPyBitmapShape : public wxBitmapShape {
+public:
+    wxPyBitmapShape() : wxBitmapShape() {}
+
+    WXSHAPE_DEC_CALLBACKS();
+};
+
+
+
+class wxPyDrawnShape : public wxDrawnShape {
+public:
+    wxPyDrawnShape() : wxDrawnShape() {}
+
+    WXSHAPE_DEC_CALLBACKS();
+};
+
+
+class wxPyCompositeShape : public wxCompositeShape {
+public:
+    wxPyCompositeShape() : wxCompositeShape() {}
+
+    WXSHAPE_DEC_CALLBACKS();
+};
+
+
+class wxPyDividedShape : public wxDividedShape {
+public:
+    wxPyDividedShape(double width = 0.0, double height = 0.0)
+        : wxDividedShape(width, height) {}
+
+    WXSHAPE_DEC_CALLBACKS();
+};
+
+
+class wxPyDivisionShape : public wxDivisionShape {
+public:
+    wxPyDivisionShape() : wxDivisionShape() {}
+
+    WXSHAPE_DEC_CALLBACKS();
+};
+
+
+class wxPyEllipseShape : public wxEllipseShape {
+public:
+    wxPyEllipseShape(double width = 0.0, double height = 0.0)
+        : wxEllipseShape(width, height) {}
+
+    WXSHAPE_DEC_CALLBACKS();
+};
+
+
+class wxPyCircleShape : public wxCircleShape {
+public:
+    wxPyCircleShape(double width = 0.0)
+        : wxCircleShape(width) {}
+
+    WXSHAPE_DEC_CALLBACKS();
+};
+
+
+class wxPyLineShape : public wxLineShape {
+public:
+    wxPyLineShape() : wxLineShape() {}
+
+    WXSHAPE_DEC_CALLBACKS();
+};
+
+
+class wxPyPolygonShape : public wxPolygonShape {
+public:
+    wxPyPolygonShape() : wxPolygonShape() {}
+
+    WXSHAPE_DEC_CALLBACKS();
+};
+
+
+class wxPyTextShape : public wxTextShape {
+public:
+    wxPyTextShape(double width = 0.0, double height = 0.0)
+        : wxTextShape(width, height) {}
+
+    WXSHAPE_DEC_CALLBACKS();
+};
+
+
+
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+#endif
+

wxPython/contrib/ogl/oglshapes.i

@@ -0,0 +1,574 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        oglshapes.i
+// Purpose:     SWIG definitions for the wxWindows Object Graphics Library
+//
+// Author:      Robin Dunn
+//
+// Created:     3-Sept-1999
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 by Total Control Software
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+
+%module oglshapes
+
+%{
+#include "helpers.h"
+#include "oglhelpers.h"
+%}
+
+//---------------------------------------------------------------------------
+
+%include typemaps.i
+%include my_typemaps.i
+
+%extern wx.i
+%import windows.i
+%extern _defs.i
+%extern misc.i
+%extern gdi.i
+
+%include _ogldefs.i
+
+%import oglbasic.i
+
+
+%pragma(python) code = "import wx"
+
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+
+class wxPseudoMetaFile {
+public:
+  wxPseudoMetaFile();
+  ~wxPseudoMetaFile();
+
+    void Draw(wxDC& dc, double xoffset, double yoffset);
+
+    void WriteAttributes(wxExpr *clause, int whichAngle);
+    void ReadAttributes(wxExpr *clause, int whichAngle);
+    void Clear();
+    void Copy(wxPseudoMetaFile& copy);
+    void Scale(double sx, double sy);
+    void ScaleTo(double w, double h);
+    void Translate(double x, double y);
+    void Rotate(double x, double y, double theta);
+    bool LoadFromMetaFile(char* filename, double *width, double *height);
+    void GetBounds(double *minX, double *minY, double *maxX, double *maxY);
+    void CalculateSize(wxDrawnShape* shape);
+
+    // ****  fix these...  is it even possible?  these are lists of various GDI opperations (not the objects...)
+    // wxList& GetOutlineColours();
+    // wxList& GetFillColours();
+    // wxList& GetOps();
+
+    void SetRotateable(bool rot);
+    bool GetRotateable();
+    void SetSize(double w, double h);
+    void SetFillBrush(wxBrush* brush);
+    wxBrush* GetFillBrush();
+    void SetOutlinePen(wxPen* pen);
+    wxPen* GetOutlinePen();
+    void SetOutlineOp(int op);
+    int GetOutlineOp();
+
+
+    bool IsValid();
+    void DrawLine(const wxPoint& pt1, const wxPoint& pt2);
+    void DrawRectangle(const wxRect& rect);
+    void DrawRoundedRectangle(const wxRect& rect, double radius);
+    void DrawArc(const wxPoint& centrePt, const wxPoint& startPt, const wxPoint& endPt);
+    void DrawEllipticArc(const wxRect& rect, double startAngle, double endAngle);
+    void DrawEllipse(const wxRect& rect);
+    void DrawPoint(const wxPoint& pt);
+    void DrawText(const wxString& text, const wxPoint& pt);
+    void DrawLines(int PCOUNT, wxPoint* points);
+    void DrawPolygon(int PCOUNT, wxPoint* points, int flags = 0);
+    void DrawSpline(int PCOUNT, wxPoint* points);
+    void SetClippingRect(const wxRect& rect);
+    void DestroyClippingRect();
+    void SetPen(wxPen* pen, bool isOutline = FALSE);
+    void SetBrush(wxBrush* brush, bool isFill = FALSE);
+    void SetFont(wxFont* font);
+    void SetTextColour(const wxColour& colour);
+    void SetBackgroundColour(const wxColour& colour);
+    void SetBackgroundMode(int mode);
+};
+
+
+//---------------------------------------------------------------------------
+
+%{
+    WXSHAPE_IMP_CALLBACKS(wxPyRectangleShape, wxRectangleShape);
+%}
+
+class wxPyRectangleShape : public wxPyShape {
+public:
+    wxPyRectangleShape(double width = 0.0, double height = 0.0);
+
+    void _setSelf(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyRectangleShape)"
+
+    void SetCornerRadius(double radius);
+
+    void base_OnDelete();
+    void base_OnDraw(wxDC& dc);
+    void base_OnDrawContents(wxDC& dc);
+    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
+    void base_OnMoveLinks(wxDC& dc);
+    void base_OnErase(wxDC& dc);
+    void base_OnEraseContents(wxDC& dc);
+    void base_OnHighlight(wxDC& dc);
+    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnSize(double x, double y);
+    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
+    void base_OnDrawControlPoints(wxDC& dc);
+    void base_OnEraseControlPoints(wxDC& dc);
+    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginSize(double w, double h);
+    void base_OnEndSize(double w, double h);
+//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
+};
+
+//---------------------------------------------------------------------------
+
+%{
+    WXSHAPE_IMP_CALLBACKS(wxPyControlPoint, wxControlPoint);
+%}
+
+class wxPyControlPoint : public wxPyRectangleShape {
+public:
+    wxPyControlPoint(wxPyShapeCanvas *the_canvas = NULL,
+                     wxPyShape *object = NULL,
+                     double size = 0.0, double the_xoffset = 0.0,
+                     double the_yoffset = 0.0, int the_type = 0);
+
+    void _setSelf(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyControlPoint)"
+
+    void SetCornerRadius(double radius);
+
+    void base_OnDelete();
+    void base_OnDraw(wxDC& dc);
+    void base_OnDrawContents(wxDC& dc);
+    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
+    void base_OnMoveLinks(wxDC& dc);
+    void base_OnErase(wxDC& dc);
+    void base_OnEraseContents(wxDC& dc);
+    void base_OnHighlight(wxDC& dc);
+    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnSize(double x, double y);
+    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
+    void base_OnDrawControlPoints(wxDC& dc);
+    void base_OnEraseControlPoints(wxDC& dc);
+    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginSize(double w, double h);
+    void base_OnEndSize(double w, double h);
+//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
+};
+
+//---------------------------------------------------------------------------
+%{
+    WXSHAPE_IMP_CALLBACKS(wxPyBitmapShape, wxBitmapShape);
+%}
+
+
+class wxPyBitmapShape : public wxPyRectangleShape {
+public:
+    wxPyBitmapShape();
+
+    void _setSelf(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyBitmapShape)"
+
+    wxBitmap& GetBitmap();
+    wxString GetFilename();
+    void SetBitmap(const wxBitmap& bitmap);
+    void SetFilename(const wxString& filename);
+
+    void base_OnDelete();
+    void base_OnDraw(wxDC& dc);
+    void base_OnDrawContents(wxDC& dc);
+    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
+    void base_OnMoveLinks(wxDC& dc);
+    void base_OnErase(wxDC& dc);
+    void base_OnEraseContents(wxDC& dc);
+    void base_OnHighlight(wxDC& dc);
+    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnSize(double x, double y);
+    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
+    void base_OnDrawControlPoints(wxDC& dc);
+    void base_OnEraseControlPoints(wxDC& dc);
+    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginSize(double w, double h);
+    void base_OnEndSize(double w, double h);
+//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
+};
+
+//---------------------------------------------------------------------------
+%{
+    WXSHAPE_IMP_CALLBACKS(wxPyDrawnShape, wxDrawnShape);
+%}
+
+class wxPyDrawnShape : public wxPyRectangleShape {
+public:
+    wxPyDrawnShape();
+
+    void _setSelf(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyDrawnShape)"
+
+    void CalculateSize();
+    void DestroyClippingRect();
+    void DrawArc(const wxPoint& centrePoint, const wxPoint& startPoint,
+                 const wxPoint& endPoint);
+    void DrawAtAngle(int angle);
+    void DrawEllipticArc(const wxRect& rect, double startAngle, double endAngle);
+    void DrawLine(const wxPoint& point1, const wxPoint& point2);
+    void DrawLines(int PCOUNT, wxPoint* points);
+    void DrawPoint(const wxPoint& point);
+    void DrawPolygon(int PCOUNT, wxPoint* points, int flags = 0);
+    void DrawRectangle(const wxRect& rect);
+    void DrawRoundedRectangle(const wxRect& rect, double radius);
+    void DrawSpline(int PCOUNT, wxPoint* points);
+    void DrawText(const wxString& text, const wxPoint& point);
+    int GetAngle();
+
+    wxPseudoMetaFile& GetMetaFile();
+
+    double GetRotation();
+    bool LoadFromMetaFile(char * filename);
+    void Rotate(double x, double y, double theta);
+    void SetClippingRect(const wxRect& rect);
+    void SetDrawnBackgroundColour(const wxColour& colour);
+    void SetDrawnBackgroundMode(int mode);
+    void SetDrawnBrush(wxBrush* pen, bool isOutline = FALSE);
+    void SetDrawnFont(wxFont* font);
+    void SetDrawnPen(wxPen* pen, bool isOutline = FALSE);
+    void SetDrawnTextColour(const wxColour& colour);
+    void Scale(double sx, double sy);
+    void SetSaveToFile(bool save);
+    void Translate(double x, double y);
+
+
+    void base_OnDelete();
+    void base_OnDraw(wxDC& dc);
+    void base_OnDrawContents(wxDC& dc);
+    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
+    void base_OnMoveLinks(wxDC& dc);
+    void base_OnErase(wxDC& dc);
+    void base_OnEraseContents(wxDC& dc);
+    void base_OnHighlight(wxDC& dc);
+    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnSize(double x, double y);
+    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
+    void base_OnDrawControlPoints(wxDC& dc);
+    void base_OnEraseControlPoints(wxDC& dc);
+    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginSize(double w, double h);
+    void base_OnEndSize(double w, double h);
+//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
+
+};
+
+
+//---------------------------------------------------------------------------
+
+class wxOGLConstraint  {
+public:
+    //wxOGLConstraint(int type, wxPyShape *constraining, wxList& constrained);
+    %addmethods {
+        wxOGLConstraint(int type, wxPyShape *constraining, PyObject* constrained) {
+            wxList* list = wxPy_wxListHelper(constrained, "_wxPyShape_p");
+            wxOGLConstraint* rv = new wxOGLConstraint(type, constraining, *list);
+            delete list;
+            return rv;
+        }
+    }
+    ~wxOGLConstraint();
+
+    bool Evaluate();
+    void SetSpacing(double x, double y);
+    bool Equals(double a, double b);
+
+};
+
+
+
+//---------------------------------------------------------------------------
+
+%{
+    WXSHAPE_IMP_CALLBACKS(wxPyCompositeShape, wxCompositeShape);
+%}
+
+class wxPyCompositeShape : public wxPyRectangleShape {
+public:
+    wxPyCompositeShape();
+
+    void _setSelf(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyCompositeShape)"
+
+    void AddChild(wxPyShape *child, wxPyShape *addAfter = NULL);
+
+    wxOGLConstraint * AddConstraint(wxOGLConstraint *constraint);
+
+
+    //wxOGLConstraint * AddConstraint(int type,
+    //                                wxPyShape *constraining,
+    //                                wxList& constrained);
+    %addmethods {
+        wxOGLConstraint * AddConstrainedShapes(int type, wxPyShape *constraining,
+                                               PyObject* constrained) {
+            wxList* list = wxPy_wxListHelper(constrained, "_wxPyShape_p");
+            wxOGLConstraint* rv = self->AddConstraint(type, constraining, *list);
+            delete list;
+            return rv;
+        }
+    }
+
+    %name(AddSimpleConstraint)wxOGLConstraint* AddConstraint(int type,
+                                                             wxPyShape *constraining,
+                                                             wxPyShape *constrained);
+
+    void CalculateSize();
+    bool ContainsDivision(wxPyDivisionShape *division);
+    void DeleteConstraint(wxOGLConstraint *constraint);
+    void DeleteConstraintsInvolvingChild(wxPyShape *child);
+
+    // ****  Needs an output typemap
+    //wxOGLConstraint * FindConstraint(long id, wxPyCompositeShape **actualComposite);
+
+    wxPyShape * FindContainerImage();
+
+    // wxList& GetConstraints();
+    // wxList& GetDivisions();
+    %addmethods {
+        PyObject* GetConstraints() {
+            wxList& list = self->GetConstraints();
+            return wxPy_ConvertList(&list, "wxOGLConstraint");
+        }
+
+        PyObject* GetDivisions() {
+            wxList& list = self->GetDivisions();
+            return wxPy_ConvertList(&list, "wxPyDivisionShape");
+        }
+    }
+
+    void MakeContainer();
+    bool Recompute();
+    void RemoveChild(wxPyShape *child);
+
+
+    void base_OnDelete();
+    void base_OnDraw(wxDC& dc);
+    void base_OnDrawContents(wxDC& dc);
+    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
+    void base_OnMoveLinks(wxDC& dc);
+    void base_OnErase(wxDC& dc);
+    void base_OnEraseContents(wxDC& dc);
+    void base_OnHighlight(wxDC& dc);
+    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnSize(double x, double y);
+    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
+    void base_OnDrawControlPoints(wxDC& dc);
+    void base_OnEraseControlPoints(wxDC& dc);
+    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginSize(double w, double h);
+    void base_OnEndSize(double w, double h);
+//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
+
+};
+
+
+//---------------------------------------------------------------------------
+
+%{
+    WXSHAPE_IMP_CALLBACKS(wxPyDividedShape, wxDividedShape);
+%}
+
+class wxPyDividedShape : public wxPyRectangleShape {
+public:
+    wxPyDividedShape(double width = 0.0, double height = 0.0);
+
+    void _setSelf(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyDividedShape)"
+
+    void EditRegions();
+    void SetRegionSizes();
+
+    void base_OnDelete();
+    void base_OnDraw(wxDC& dc);
+    void base_OnDrawContents(wxDC& dc);
+    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
+    void base_OnMoveLinks(wxDC& dc);
+    void base_OnErase(wxDC& dc);
+    void base_OnEraseContents(wxDC& dc);
+    void base_OnHighlight(wxDC& dc);
+    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnSize(double x, double y);
+    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
+    void base_OnDrawControlPoints(wxDC& dc);
+    void base_OnEraseControlPoints(wxDC& dc);
+    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginSize(double w, double h);
+    void base_OnEndSize(double w, double h);
+//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
+
+};
+
+
+//---------------------------------------------------------------------------
+%{
+    WXSHAPE_IMP_CALLBACKS(wxPyDivisionShape, wxDivisionShape);
+%}
+
+class wxPyDivisionShape : public wxPyCompositeShape {
+public:
+    wxPyDivisionShape();
+
+    void _setSelf(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyDivisionShape)"
+
+    void AdjustBottom(double bottom, bool test);
+    void AdjustLeft(double left, bool test);
+    void AdjustRight(double right, bool test);
+    void AdjustTop(double top, bool test);
+    void Divide(int direction);
+    void EditEdge(int side);
+    wxPyDivisionShape * GetBottomSide();
+    int GetHandleSide();
+    wxPyDivisionShape * GetLeftSide();
+    wxString GetLeftSideColour();
+    wxPen * GetLeftSidePen();
+    wxPyDivisionShape * GetRightSide();
+    wxPyDivisionShape * GetTopSide();
+    wxPen * GetTopSidePen();
+    void ResizeAdjoining(int side, double newPos, bool test);
+    void PopupMenu(double x, double y);
+    void SetBottomSide(wxPyDivisionShape *shape);
+    void SetHandleSide(int side);
+    void SetLeftSide(wxPyDivisionShape *shape);
+    void SetLeftSideColour(const wxString& colour);
+    void SetLeftSidePen(wxPen *pen);
+    void SetRightSide(wxPyDivisionShape *shape);
+    void SetTopSide(wxPyDivisionShape *shape);
+    void SetTopSideColour(const wxString& colour);
+    void SetTopSidePen(wxPen *pen);
+
+
+
+    void base_OnDelete();
+    void base_OnDraw(wxDC& dc);
+    void base_OnDrawContents(wxDC& dc);
+    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
+    void base_OnMoveLinks(wxDC& dc);
+    void base_OnErase(wxDC& dc);
+    void base_OnEraseContents(wxDC& dc);
+    void base_OnHighlight(wxDC& dc);
+    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnSize(double x, double y);
+    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
+    void base_OnDrawControlPoints(wxDC& dc);
+    void base_OnEraseControlPoints(wxDC& dc);
+    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginSize(double w, double h);
+    void base_OnEndSize(double w, double h);
+//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
+
+};
+
+
+
+//---------------------------------------------------------------------------
+

wxPython/contrib/ogl/oglshapes2.i

@@ -0,0 +1,369 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        oglshapes2.i
+// Purpose:     SWIG definitions for the wxWindows Object Graphics Library
+//
+// Author:      Robin Dunn
+//
+// Created:     3-Sept-1999
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 by Total Control Software
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+
+%module oglshapes2
+
+%{
+#include "helpers.h"
+#include "oglhelpers.h"
+%}
+
+//---------------------------------------------------------------------------
+
+%include typemaps.i
+%include my_typemaps.i
+
+%extern wx.i
+%import windows.i
+%extern _defs.i
+%extern misc.i
+%extern gdi.i
+
+%include _ogldefs.i
+
+%import oglbasic.i
+%import oglshapes.i
+
+
+%pragma(python) code = "import wx"
+
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+%{
+    WXSHAPE_IMP_CALLBACKS(wxPyEllipseShape, wxEllipseShape);
+%}
+
+class wxPyEllipseShape : public wxPyShape {
+public:
+    wxPyEllipseShape(double width = 0.0, double height = 0.0);
+
+    void _setSelf(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyEllipseShape)"
+
+    void base_OnDraw(wxDC& dc);
+    void base_OnDrawContents(wxDC& dc);
+    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
+    void base_OnMoveLinks(wxDC& dc);
+    void base_OnErase(wxDC& dc);
+    void base_OnEraseContents(wxDC& dc);
+    void base_OnHighlight(wxDC& dc);
+    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnSize(double x, double y);
+    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
+    void base_OnDrawControlPoints(wxDC& dc);
+    void base_OnEraseControlPoints(wxDC& dc);
+    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginSize(double w, double h);
+    void base_OnEndSize(double w, double h);
+//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
+};
+
+//---------------------------------------------------------------------------
+%{
+    WXSHAPE_IMP_CALLBACKS(wxPyCircleShape, wxCircleShape);
+%}
+
+class wxPyCircleShape : public wxPyEllipseShape {
+public:
+    wxPyCircleShape(double width = 0.0);
+
+    void _setSelf(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyCircleShape)"
+
+    void base_OnDraw(wxDC& dc);
+    void base_OnDrawContents(wxDC& dc);
+    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
+    void base_OnMoveLinks(wxDC& dc);
+    void base_OnErase(wxDC& dc);
+    void base_OnEraseContents(wxDC& dc);
+    void base_OnHighlight(wxDC& dc);
+    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnSize(double x, double y);
+    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
+    void base_OnDrawControlPoints(wxDC& dc);
+    void base_OnEraseControlPoints(wxDC& dc);
+    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginSize(double w, double h);
+    void base_OnEndSize(double w, double h);
+//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
+};
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+class wxArrowHead {
+public:
+    wxArrowHead(int type = 0,
+                int end = 0,
+                double size = 0.0,
+                double dist = 0.0,
+                const char * name = "",
+                wxPseudoMetaFile *mf = NULL,
+                long arrowId = -1);
+    ~wxArrowHead();
+
+    int _GetType();
+    int GetPosition();
+    void SetPosition(int pos);
+    double GetXOffset();
+    double GetYOffset();
+    double GetSpacing();
+    double GetSize();
+    wxString GetName();
+    void SetXOffset(double x);
+    void SetYOffset(double y);
+    wxPseudoMetaFile *GetMetaFile();
+    long GetId();
+    int GetArrowEnd();
+    double GetArrowSize();
+    void SetSize(double size);
+    void SetSpacing(double sp);
+};
+//---------------------------------------------------------------------------
+%{
+    WXSHAPE_IMP_CALLBACKS(wxPyLineShape, wxLineShape);
+%}
+
+class wxPyLineShape : public wxPyShape {
+public:
+    wxPyLineShape();
+
+    void _setSelf(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyLineShape)"
+
+    void AddArrow(int type, int end = ARROW_POSITION_END,
+                  double arrowSize = 10.0, double xOffset = 0.0,
+                  char* name = "", wxPseudoMetaFile *mf = NULL,
+                  long arrowId = -1);
+
+    //void AddArrowOrdered(wxArrowHead *arrow, wxList& referenceList, int end);
+    %addmethods {
+        void AddArrowOrdered(wxArrowHead *arrow, PyObject* referenceList, int end) {
+            wxList* list = wxPy_wxListHelper(referenceList, "_wxArrowHead_p");
+            self->AddArrowOrdered(arrow, *list, end);
+            delete list;
+        }
+    }
+    bool ClearArrow(const wxString& name);
+    void ClearArrowsAtPosition(int position = -1);
+    void DrawArrow(wxDC& dc, wxArrowHead *arrow, double xOffset, bool proportionalOffset);
+    %name(DeleteArrowHeadId)bool DeleteArrowHead(long arrowId);
+    bool DeleteArrowHead(int position, const wxString& name);
+    bool DeleteLineControlPoint();
+    void DrawArrows(wxDC& dc);
+    void DrawRegion(wxDC& dc, wxShapeRegion *region, double x, double y);
+    void EraseRegion(wxDC& dc, wxShapeRegion *region, double x, double y);
+    %name(FindArrowHeadId)wxArrowHead * FindArrowHead(long arrowId);
+    wxArrowHead * FindArrowHead(int position, const wxString& name);
+    void FindLineEndPoints(double *OUTPUT, double *OUTPUT,
+                           double *OUTPUT, double *OUTPUT);
+    int FindLinePosition(double x, double y);
+    double FindMinimumWidth();
+    void FindNth(wxPyShape *image, int *OUTPUT, int *OUTPUT, bool incoming);
+    int GetAttachmentFrom();
+    int GetAttachmentTo();
+    void GetEnds(double *OUTPUT, double *OUTPUT, double *OUTPUT, double *OUTPUT);
+    wxPyShape * GetFrom();
+    void GetLabelPosition(int position, double *OUTPUT, double *OUTPUT);
+    wxPoint * GetNextControlPoint(wxPyShape *shape);
+    wxPyShape * GetTo();
+    void Initialise();
+    void InsertLineControlPoint(wxDC* dc);
+    bool IsEnd(wxPyShape *shape);
+    bool IsSpline();
+    void MakeLineControlPoints(int n);
+
+    void SetAttachmentFrom(int fromAttach);
+    void SetAttachments(int fromAttach, int toAttach);
+    void SetAttachmentTo(int toAttach);
+    void SetEnds(double x1, double y1, double x2, double y2);
+    void SetFrom(wxPyShape *object);
+    void SetIgnoreOffsets(bool ignore);
+    void SetSpline(bool spline);
+    void SetTo(wxPyShape *object);
+    void Straighten(wxDC* dc = NULL);
+    void Unlink();
+
+
+    void base_OnDraw(wxDC& dc);
+    void base_OnDrawContents(wxDC& dc);
+    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
+    void base_OnMoveLinks(wxDC& dc);
+    void base_OnErase(wxDC& dc);
+    void base_OnEraseContents(wxDC& dc);
+    void base_OnHighlight(wxDC& dc);
+    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnSize(double x, double y);
+    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
+    void base_OnDrawControlPoints(wxDC& dc);
+    void base_OnEraseControlPoints(wxDC& dc);
+    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginSize(double w, double h);
+    void base_OnEndSize(double w, double h);
+//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
+};
+
+//---------------------------------------------------------------------------
+%{
+    WXSHAPE_IMP_CALLBACKS(wxPyPolygonShape, wxPolygonShape);
+%}
+
+class wxPyPolygonShape : public wxPyShape {
+public:
+    wxPyPolygonShape();
+
+    void _setSelf(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyPolygonShape)"
+
+
+    // void Create(wxList* points);
+    %addmethods {
+        PyObject* Create(PyObject* points) {
+            wxList* list = wxPy_wxRealPoint_ListHelper(points);
+            if (list) {
+                self->Create(list);
+                Py_INCREF(Py_None);
+                return Py_None;
+            }
+            else return NULL;
+        }
+    }
+
+    void AddPolygonPoint(int pos = 0);
+    void CalculatePolygonCentre();
+    void DeletePolygonPoint(int pos = 0);
+
+    // wxList* GetPoints();
+    %addmethods {
+        PyObject* GetPoints() {
+            wxList* list = self->GetPoints();
+            return wxPy_ConvertList(list, "wxRealPoint");
+        }
+    }
+
+    void UpdateOriginalPoints();
+
+
+    void base_OnDraw(wxDC& dc);
+    void base_OnDrawContents(wxDC& dc);
+    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
+    void base_OnMoveLinks(wxDC& dc);
+    void base_OnErase(wxDC& dc);
+    void base_OnEraseContents(wxDC& dc);
+    void base_OnHighlight(wxDC& dc);
+    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnSize(double x, double y);
+    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
+    void base_OnDrawControlPoints(wxDC& dc);
+    void base_OnEraseControlPoints(wxDC& dc);
+    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginSize(double w, double h);
+    void base_OnEndSize(double w, double h);
+//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
+};
+//---------------------------------------------------------------------------
+%{
+    WXSHAPE_IMP_CALLBACKS(wxPyTextShape, wxTextShape);
+%}
+
+class wxPyTextShape : public wxPyRectangleShape {
+public:
+    wxPyTextShape(double width = 0.0, double height = 0.0);
+
+    void _setSelf(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyTextShape)"
+
+
+    void base_OnDelete();
+    void base_OnDraw(wxDC& dc);
+    void base_OnDrawContents(wxDC& dc);
+    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
+    void base_OnMoveLinks(wxDC& dc);
+    void base_OnErase(wxDC& dc);
+    void base_OnEraseContents(wxDC& dc);
+    void base_OnHighlight(wxDC& dc);
+    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnSize(double x, double y);
+    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
+    void base_OnDrawControlPoints(wxDC& dc);
+    void base_OnEraseControlPoints(wxDC& dc);
+    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginSize(double w, double h);
+    void base_OnEndSize(double w, double h);
+//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
+
+};
+//---------------------------------------------------------------------------

wxPython/contrib/ogl/oglshapes2.py

@@ -0,0 +1,768 @@
+# This file was created automatically by SWIG.
+import oglshapes2c
+
+from misc import *
+
+from misc2 import *
+
+from windows import *
+
+from gdi import *
+
+from clip_dnd import *
+
+from events import *
+
+from mdi import *
+
+from frames import *
+
+from stattool import *
+
+from controls import *
+
+from controls2 import *
+
+from windows2 import *
+
+from cmndlgs import *
+
+from windows3 import *
+
+from image import *
+
+from printfw import *
+
+from sizers import *
+
+from oglbasic import *
+
+from oglshapes import *
+import wx
+class wxPyEllipseShapePtr(wxPyShapePtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setSelf(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape__setSelf,(self,) + _args, _kwargs)
+        return val
+    def base_OnDraw(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnDraw,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawContents(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnDrawContents,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawBranches(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnDrawBranches,(self,) + _args, _kwargs)
+        return val
+    def base_OnMoveLinks(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnMoveLinks,(self,) + _args, _kwargs)
+        return val
+    def base_OnErase(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnErase,(self,) + _args, _kwargs)
+        return val
+    def base_OnEraseContents(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnEraseContents,(self,) + _args, _kwargs)
+        return val
+    def base_OnHighlight(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnHighlight,(self,) + _args, _kwargs)
+        return val
+    def base_OnLeftClick(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnLeftClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnLeftDoubleClick(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnLeftDoubleClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnRightClick(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnRightClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnSize(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnSize,(self,) + _args, _kwargs)
+        return val
+    def base_OnMovePre(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnMovePre,(self,) + _args, _kwargs)
+        return val
+    def base_OnMovePost(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnMovePost,(self,) + _args, _kwargs)
+        return val
+    def base_OnDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnBeginDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnEndDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnDragRight(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginDragRight(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnBeginDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndDragRight(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnEndDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawOutline(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnDrawOutline,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawControlPoints(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnDrawControlPoints,(self,) + _args, _kwargs)
+        return val
+    def base_OnEraseControlPoints(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnEraseControlPoints,(self,) + _args, _kwargs)
+        return val
+    def base_OnMoveLink(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnMoveLink,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnSizingDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingBeginDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnSizingBeginDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingEndDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnSizingEndDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginSize(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnBeginSize,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndSize(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyEllipseShape_base_OnEndSize,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxPyEllipseShape instance at %s>" % (self.this,)
+class wxPyEllipseShape(wxPyEllipseShapePtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(oglshapes2c.new_wxPyEllipseShape,_args,_kwargs)
+        self.thisown = 1
+        self._setSelf(self, wxPyEllipseShape)
+
+
+
+
+class wxPyCircleShapePtr(wxPyEllipseShapePtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setSelf(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape__setSelf,(self,) + _args, _kwargs)
+        return val
+    def base_OnDraw(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnDraw,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawContents(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnDrawContents,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawBranches(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnDrawBranches,(self,) + _args, _kwargs)
+        return val
+    def base_OnMoveLinks(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnMoveLinks,(self,) + _args, _kwargs)
+        return val
+    def base_OnErase(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnErase,(self,) + _args, _kwargs)
+        return val
+    def base_OnEraseContents(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnEraseContents,(self,) + _args, _kwargs)
+        return val
+    def base_OnHighlight(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnHighlight,(self,) + _args, _kwargs)
+        return val
+    def base_OnLeftClick(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnLeftClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnLeftDoubleClick(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnLeftDoubleClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnRightClick(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnRightClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnSize(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnSize,(self,) + _args, _kwargs)
+        return val
+    def base_OnMovePre(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnMovePre,(self,) + _args, _kwargs)
+        return val
+    def base_OnMovePost(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnMovePost,(self,) + _args, _kwargs)
+        return val
+    def base_OnDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnBeginDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnEndDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnDragRight(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginDragRight(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnBeginDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndDragRight(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnEndDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawOutline(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnDrawOutline,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawControlPoints(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnDrawControlPoints,(self,) + _args, _kwargs)
+        return val
+    def base_OnEraseControlPoints(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnEraseControlPoints,(self,) + _args, _kwargs)
+        return val
+    def base_OnMoveLink(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnMoveLink,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnSizingDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingBeginDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnSizingBeginDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingEndDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnSizingEndDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginSize(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnBeginSize,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndSize(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyCircleShape_base_OnEndSize,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxPyCircleShape instance at %s>" % (self.this,)
+class wxPyCircleShape(wxPyCircleShapePtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(oglshapes2c.new_wxPyCircleShape,_args,_kwargs)
+        self.thisown = 1
+        self._setSelf(self, wxPyCircleShape)
+
+
+
+
+class wxArrowHeadPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,oglshapes2c=oglshapes2c):
+        if self.thisown == 1 :
+            oglshapes2c.delete_wxArrowHead(self)
+    def _GetType(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxArrowHead__GetType,(self,) + _args, _kwargs)
+        return val
+    def GetPosition(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxArrowHead_GetPosition,(self,) + _args, _kwargs)
+        return val
+    def SetPosition(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxArrowHead_SetPosition,(self,) + _args, _kwargs)
+        return val
+    def GetXOffset(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxArrowHead_GetXOffset,(self,) + _args, _kwargs)
+        return val
+    def GetYOffset(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxArrowHead_GetYOffset,(self,) + _args, _kwargs)
+        return val
+    def GetSpacing(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxArrowHead_GetSpacing,(self,) + _args, _kwargs)
+        return val
+    def GetSize(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxArrowHead_GetSize,(self,) + _args, _kwargs)
+        return val
+    def GetName(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxArrowHead_GetName,(self,) + _args, _kwargs)
+        return val
+    def SetXOffset(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxArrowHead_SetXOffset,(self,) + _args, _kwargs)
+        return val
+    def SetYOffset(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxArrowHead_SetYOffset,(self,) + _args, _kwargs)
+        return val
+    def GetMetaFile(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxArrowHead_GetMetaFile,(self,) + _args, _kwargs)
+        if val: val = wxPseudoMetaFilePtr(val) 
+        return val
+    def GetId(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxArrowHead_GetId,(self,) + _args, _kwargs)
+        return val
+    def GetArrowEnd(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxArrowHead_GetArrowEnd,(self,) + _args, _kwargs)
+        return val
+    def GetArrowSize(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxArrowHead_GetArrowSize,(self,) + _args, _kwargs)
+        return val
+    def SetSize(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxArrowHead_SetSize,(self,) + _args, _kwargs)
+        return val
+    def SetSpacing(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxArrowHead_SetSpacing,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxArrowHead instance at %s>" % (self.this,)
+class wxArrowHead(wxArrowHeadPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(oglshapes2c.new_wxArrowHead,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxPyLineShapePtr(wxPyShapePtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setSelf(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape__setSelf,(self,) + _args, _kwargs)
+        return val
+    def AddArrow(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_AddArrow,(self,) + _args, _kwargs)
+        return val
+    def AddArrowOrdered(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_AddArrowOrdered,(self,) + _args, _kwargs)
+        return val
+    def ClearArrow(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_ClearArrow,(self,) + _args, _kwargs)
+        return val
+    def ClearArrowsAtPosition(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_ClearArrowsAtPosition,(self,) + _args, _kwargs)
+        return val
+    def DrawArrow(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_DrawArrow,(self,) + _args, _kwargs)
+        return val
+    def DeleteArrowHeadId(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_DeleteArrowHeadId,(self,) + _args, _kwargs)
+        return val
+    def DeleteArrowHead(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_DeleteArrowHead,(self,) + _args, _kwargs)
+        return val
+    def DeleteLineControlPoint(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_DeleteLineControlPoint,(self,) + _args, _kwargs)
+        return val
+    def DrawArrows(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_DrawArrows,(self,) + _args, _kwargs)
+        return val
+    def DrawRegion(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_DrawRegion,(self,) + _args, _kwargs)
+        return val
+    def EraseRegion(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_EraseRegion,(self,) + _args, _kwargs)
+        return val
+    def FindArrowHeadId(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_FindArrowHeadId,(self,) + _args, _kwargs)
+        if val: val = wxArrowHeadPtr(val) 
+        return val
+    def FindArrowHead(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_FindArrowHead,(self,) + _args, _kwargs)
+        if val: val = wxArrowHeadPtr(val) 
+        return val
+    def FindLineEndPoints(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_FindLineEndPoints,(self,) + _args, _kwargs)
+        return val
+    def FindLinePosition(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_FindLinePosition,(self,) + _args, _kwargs)
+        return val
+    def FindMinimumWidth(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_FindMinimumWidth,(self,) + _args, _kwargs)
+        return val
+    def FindNth(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_FindNth,(self,) + _args, _kwargs)
+        return val
+    def GetAttachmentFrom(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_GetAttachmentFrom,(self,) + _args, _kwargs)
+        return val
+    def GetAttachmentTo(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_GetAttachmentTo,(self,) + _args, _kwargs)
+        return val
+    def GetEnds(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_GetEnds,(self,) + _args, _kwargs)
+        return val
+    def GetFrom(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_GetFrom,(self,) + _args, _kwargs)
+        if val: val = wxPyShapePtr(val) 
+        return val
+    def GetLabelPosition(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_GetLabelPosition,(self,) + _args, _kwargs)
+        return val
+    def GetNextControlPoint(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_GetNextControlPoint,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) 
+        return val
+    def GetTo(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_GetTo,(self,) + _args, _kwargs)
+        if val: val = wxPyShapePtr(val) 
+        return val
+    def Initialise(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_Initialise,(self,) + _args, _kwargs)
+        return val
+    def InsertLineControlPoint(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_InsertLineControlPoint,(self,) + _args, _kwargs)
+        return val
+    def IsEnd(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_IsEnd,(self,) + _args, _kwargs)
+        return val
+    def IsSpline(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_IsSpline,(self,) + _args, _kwargs)
+        return val
+    def MakeLineControlPoints(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_MakeLineControlPoints,(self,) + _args, _kwargs)
+        return val
+    def SetAttachmentFrom(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_SetAttachmentFrom,(self,) + _args, _kwargs)
+        return val
+    def SetAttachments(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_SetAttachments,(self,) + _args, _kwargs)
+        return val
+    def SetAttachmentTo(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_SetAttachmentTo,(self,) + _args, _kwargs)
+        return val
+    def SetEnds(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_SetEnds,(self,) + _args, _kwargs)
+        return val
+    def SetFrom(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_SetFrom,(self,) + _args, _kwargs)
+        return val
+    def SetIgnoreOffsets(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_SetIgnoreOffsets,(self,) + _args, _kwargs)
+        return val
+    def SetSpline(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_SetSpline,(self,) + _args, _kwargs)
+        return val
+    def SetTo(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_SetTo,(self,) + _args, _kwargs)
+        return val
+    def Straighten(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_Straighten,(self,) + _args, _kwargs)
+        return val
+    def Unlink(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_Unlink,(self,) + _args, _kwargs)
+        return val
+    def base_OnDraw(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnDraw,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawContents(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnDrawContents,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawBranches(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnDrawBranches,(self,) + _args, _kwargs)
+        return val
+    def base_OnMoveLinks(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnMoveLinks,(self,) + _args, _kwargs)
+        return val
+    def base_OnErase(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnErase,(self,) + _args, _kwargs)
+        return val
+    def base_OnEraseContents(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnEraseContents,(self,) + _args, _kwargs)
+        return val
+    def base_OnHighlight(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnHighlight,(self,) + _args, _kwargs)
+        return val
+    def base_OnLeftClick(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnLeftClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnLeftDoubleClick(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnLeftDoubleClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnRightClick(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnRightClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnSize(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnSize,(self,) + _args, _kwargs)
+        return val
+    def base_OnMovePre(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnMovePre,(self,) + _args, _kwargs)
+        return val
+    def base_OnMovePost(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnMovePost,(self,) + _args, _kwargs)
+        return val
+    def base_OnDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnBeginDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnEndDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnDragRight(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginDragRight(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnBeginDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndDragRight(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnEndDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawOutline(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnDrawOutline,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawControlPoints(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnDrawControlPoints,(self,) + _args, _kwargs)
+        return val
+    def base_OnEraseControlPoints(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnEraseControlPoints,(self,) + _args, _kwargs)
+        return val
+    def base_OnMoveLink(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnMoveLink,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnSizingDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingBeginDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnSizingBeginDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingEndDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnSizingEndDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginSize(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnBeginSize,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndSize(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyLineShape_base_OnEndSize,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxPyLineShape instance at %s>" % (self.this,)
+class wxPyLineShape(wxPyLineShapePtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(oglshapes2c.new_wxPyLineShape,_args,_kwargs)
+        self.thisown = 1
+        self._setSelf(self, wxPyLineShape)
+
+
+
+
+class wxPyPolygonShapePtr(wxPyShapePtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setSelf(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape__setSelf,(self,) + _args, _kwargs)
+        return val
+    def Create(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_Create,(self,) + _args, _kwargs)
+        return val
+    def AddPolygonPoint(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_AddPolygonPoint,(self,) + _args, _kwargs)
+        return val
+    def CalculatePolygonCentre(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_CalculatePolygonCentre,(self,) + _args, _kwargs)
+        return val
+    def DeletePolygonPoint(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_DeletePolygonPoint,(self,) + _args, _kwargs)
+        return val
+    def GetPoints(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_GetPoints,(self,) + _args, _kwargs)
+        return val
+    def UpdateOriginalPoints(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_UpdateOriginalPoints,(self,) + _args, _kwargs)
+        return val
+    def base_OnDraw(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnDraw,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawContents(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnDrawContents,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawBranches(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnDrawBranches,(self,) + _args, _kwargs)
+        return val
+    def base_OnMoveLinks(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnMoveLinks,(self,) + _args, _kwargs)
+        return val
+    def base_OnErase(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnErase,(self,) + _args, _kwargs)
+        return val
+    def base_OnEraseContents(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnEraseContents,(self,) + _args, _kwargs)
+        return val
+    def base_OnHighlight(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnHighlight,(self,) + _args, _kwargs)
+        return val
+    def base_OnLeftClick(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnLeftClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnLeftDoubleClick(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnLeftDoubleClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnRightClick(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnRightClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnSize(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnSize,(self,) + _args, _kwargs)
+        return val
+    def base_OnMovePre(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnMovePre,(self,) + _args, _kwargs)
+        return val
+    def base_OnMovePost(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnMovePost,(self,) + _args, _kwargs)
+        return val
+    def base_OnDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnBeginDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnEndDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnDragRight(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginDragRight(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnBeginDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndDragRight(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnEndDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawOutline(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnDrawOutline,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawControlPoints(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnDrawControlPoints,(self,) + _args, _kwargs)
+        return val
+    def base_OnEraseControlPoints(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnEraseControlPoints,(self,) + _args, _kwargs)
+        return val
+    def base_OnMoveLink(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnMoveLink,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnSizingDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingBeginDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnSizingBeginDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingEndDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnSizingEndDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginSize(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnBeginSize,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndSize(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyPolygonShape_base_OnEndSize,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxPyPolygonShape instance at %s>" % (self.this,)
+class wxPyPolygonShape(wxPyPolygonShapePtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(oglshapes2c.new_wxPyPolygonShape,_args,_kwargs)
+        self.thisown = 1
+        self._setSelf(self, wxPyPolygonShape)
+
+
+
+
+class wxPyTextShapePtr(wxPyRectangleShapePtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setSelf(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape__setSelf,(self,) + _args, _kwargs)
+        return val
+    def base_OnDelete(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnDelete,(self,) + _args, _kwargs)
+        return val
+    def base_OnDraw(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnDraw,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawContents(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnDrawContents,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawBranches(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnDrawBranches,(self,) + _args, _kwargs)
+        return val
+    def base_OnMoveLinks(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnMoveLinks,(self,) + _args, _kwargs)
+        return val
+    def base_OnErase(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnErase,(self,) + _args, _kwargs)
+        return val
+    def base_OnEraseContents(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnEraseContents,(self,) + _args, _kwargs)
+        return val
+    def base_OnHighlight(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnHighlight,(self,) + _args, _kwargs)
+        return val
+    def base_OnLeftClick(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnLeftClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnLeftDoubleClick(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnLeftDoubleClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnRightClick(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnRightClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnSize(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnSize,(self,) + _args, _kwargs)
+        return val
+    def base_OnMovePre(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnMovePre,(self,) + _args, _kwargs)
+        return val
+    def base_OnMovePost(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnMovePost,(self,) + _args, _kwargs)
+        return val
+    def base_OnDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnBeginDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnEndDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnDragRight(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginDragRight(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnBeginDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndDragRight(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnEndDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawOutline(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnDrawOutline,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawControlPoints(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnDrawControlPoints,(self,) + _args, _kwargs)
+        return val
+    def base_OnEraseControlPoints(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnEraseControlPoints,(self,) + _args, _kwargs)
+        return val
+    def base_OnMoveLink(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnMoveLink,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnSizingDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingBeginDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnSizingBeginDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingEndDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnSizingEndDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginSize(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnBeginSize,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndSize(self, *_args, **_kwargs):
+        val = apply(oglshapes2c.wxPyTextShape_base_OnEndSize,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxPyTextShape instance at %s>" % (self.this,)
+class wxPyTextShape(wxPyTextShapePtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(oglshapes2c.new_wxPyTextShape,_args,_kwargs)
+        self.thisown = 1
+        self._setSelf(self, wxPyTextShape)
+
+
+
+
+
+
+#-------------- FUNCTION WRAPPERS ------------------
+
+
+
+#-------------- VARIABLE WRAPPERS ------------------
+

wxPython/contrib/stc/.cvsignore

@@ -0,0 +1,5 @@
+Makefile
+Makefile
+stc_c.exp
+stc_c.ilk
+stc_c.pch

wxPython/contrib/stc/README.txt

@@ -0,0 +1,7 @@
+Since STC is not always bundled with distributions of wxWindows, in
+order for it to be a standard part of wxPython I need to bundle it
+here.  The contents of the contrib directory are copies of the
+relevant parts of the main contrib directory in wxWindows.  The
+build.py script in this directory will also build the needed files
+from there, so you no longer have to worry about aquiring and building
+additional libraries beyond wxWindows itself.

wxPython/contrib/stc/_stcextras.py

@@ -0,0 +1,3 @@
+# Stuff these names into the wx namespace so wxPyConstructObject can find them
+
+wx.wxStyledTextEventPtr       = wxStyledTextEventPtr

wxPython/contrib/stc/build.cfg

@@ -0,0 +1,83 @@
+# -*- python -*-
+import sys
+
+MODULE = 'stc_c'
+SWIGFILES = ['stc_.i']
+SOURCES = []
+PYFILES = ['stc.py']
+
+
+OTHERSWIGFLAGS = '-I$(STCLOC)/contrib/include/wx/stc'
+SWIGDEPS = '$(STCLOC)/contrib/include/wx/stc/stc.h'
+
+SOURCES = SOURCES + [
+	'$(STCLOC)/contrib/src/stc/scintilla/src/AutoComplete.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/CallTip.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/CellBuffer.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/ContractionState.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/Document.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/Editor.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/Indicator.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/KeyMap.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/KeyWords.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/LineMarker.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/PropSet.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/ScintillaBase.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/Style.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/ViewStyle.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/LexCPP.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/LexHTML.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/LexOthers.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/LexPerl.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/LexPython.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/LexSQL.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/LexVB.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/DocumentAccessor.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/UniConversion.cxx',
+	'$(STCLOC)/contrib/src/stc/scintilla/src/WindowAccessor.cxx',
+
+	'$(STCLOC)/contrib/src/stc/PlatWX.cpp',
+	'$(STCLOC)/contrib/src/stc/ScintillaWX.cpp',
+	'$(STCLOC)/contrib/src/stc/stc.cpp',
+        ]
+
+OTHERCFLAGS = '-D__WX__ -DSCI_LEXER ' + \
+              '-I$(STCLOC)/contrib/src/stc/scintilla/include ' + \
+              '-I$(STCLOC)/contrib/include ' + \
+              '-I$(STCLOC)/contrib/src/stc/scintilla/src'
+
+
+if sys.platform == 'win32':
+    OTHERDEFS = 'STCLOC = $(WXWIN)'
+    OTHERRULES = '''
+{$(WXWIN)/contrib/src/stc}.cpp{}.obj:
+	$(cc) @<<
+$(CPPFLAGS) /c /Tp $<
+<<
+
+{$(WXWIN)/contrib/src/stc/scintilla/src}.cxx{}.obj:
+	$(cc) @<<
+$(CPPFLAGS) /c /Tp $<
+<<
+'''
+
+else:
+    DEFAULTRULE = 'default: contrib $(GENCODEDIR) $(TARGET)'
+    OTHERDEFS = 'STCLOC = .'
+    OTHERRULES = '''
+%.o : contrib/src/stc/%.cpp
+	$(CCC) $(CCSHARED) $(CFLAGS) $(OTHERCFLAGS) -c $<
+
+%.o : contrib/src/stc/scintilla/src/%.cxx
+	$(CCC) $(CCSHARED) $(CFLAGS) $(OTHERCFLAGS) -c $<
+
+contrib :
+	ln -s $(WXWIN)/contrib contrib
+
+'''
+
+
+# There are no platform differences so we don't need separate code directories
+GENCODEDIR='.'
+SWIGTOOLKITFLAG=''
+

wxPython/contrib/stc/stc.py

@@ -0,0 +1,7 @@
+
+# The name "stc.cpp" was cuasing the debugger to get confused with the
+# same module name in the stc library, so I changed the name of this
+# one to stc_.cpp and this little stub to make the "stc" Python module
+# name still usesable for everything that matters.
+
+from stc_ import *

wxPython/contrib/stc/stc_.i

@@ -0,0 +1,102 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        stc.i
+// Purpose:     Wrappers for the wxStyledTextCtrl.
+//
+// Author:      Robin Dunn
+//
+// Created:     12-Oct-1999
+// RCS-ID:      $Id$
+// Copyright:   (c) 2000 by Total Control Software
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+%module stc_
+
+
+%{
+#include "helpers.h"
+#include "wx/stc/stc.h"
+%}
+
+//---------------------------------------------------------------------------
+
+%include typemaps.i
+%include my_typemaps.i
+
+%extern wx.i
+%extern windows.i
+%extern _defs.i
+%extern events.i
+%extern controls.i
+
+
+//----------------------------------------------------------------------
+// Get all our defs from the REAL header file.
+
+%include stc.h
+
+
+//----------------------------------------------------------------------
+// Python functions to act like the event macros
+
+%pragma(python) code = "
+def EVT_STC_CHANGE(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_CHANGE, fn)
+
+def EVT_STC_STYLENEEDED(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_STYLENEEDED, fn)
+
+def EVT_STC_CHARADDED(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_CHARADDED, fn)
+
+def EVT_STC_UPDATEUI(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_UPDATEUI, fn)
+
+def EVT_STC_SAVEPOINTREACHED(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_SAVEPOINTREACHED, fn)
+
+def EVT_STC_SAVEPOINTLEFT(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_SAVEPOINTLEFT, fn)
+
+def EVT_STC_ROMODIFYATTEMPT(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_ROMODIFYATTEMPT, fn)
+
+def EVT_STC_DOUBLECLICK(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_DOUBLECLICK, fn)
+
+def EVT_STC_MODIFIED(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_MODIFIED, fn)
+
+def EVT_STC_KEY(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_KEY, fn)
+
+def EVT_STC_MACRORECORD(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_MACRORECORD, fn)
+
+def EVT_STC_MARGINCLICK(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_MARGINCLICK, fn)
+
+def EVT_STC_NEEDSHOWN(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_NEEDSHOWN, fn)
+
+
+"
+
+//----------------------------------------------------------------------
+
+%init %{
+
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();
+
+%}
+
+
+//----------------------------------------------------------------------
+
+%pragma(python) include="_stcextras.py";
+
+//----------------------------------------------------------------------
+//----------------------------------------------------------------------
+
+

wxPython/contrib/stc/stc_.py

@@ -0,0 +1,901 @@
+# This file was created automatically by SWIG.
+import stc_c
+
+from misc import *
+
+from misc2 import *
+
+from windows import *
+
+from gdi import *
+
+from clip_dnd import *
+
+from events import *
+
+from mdi import *
+
+from frames import *
+
+from stattool import *
+
+from controls import *
+
+from controls2 import *
+
+from windows2 import *
+
+from cmndlgs import *
+
+from windows3 import *
+
+from image import *
+
+from printfw import *
+
+from sizers import *
+
+def EVT_STC_CHANGE(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_CHANGE, fn)
+
+def EVT_STC_STYLENEEDED(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_STYLENEEDED, fn)
+
+def EVT_STC_CHARADDED(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_CHARADDED, fn)
+
+def EVT_STC_UPDATEUI(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_UPDATEUI, fn)
+
+def EVT_STC_SAVEPOINTREACHED(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_SAVEPOINTREACHED, fn)
+
+def EVT_STC_SAVEPOINTLEFT(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_SAVEPOINTLEFT, fn)
+
+def EVT_STC_ROMODIFYATTEMPT(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_ROMODIFYATTEMPT, fn)
+
+def EVT_STC_DOUBLECLICK(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_DOUBLECLICK, fn)
+
+def EVT_STC_MODIFIED(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_MODIFIED, fn)
+
+def EVT_STC_KEY(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_KEY, fn)
+
+def EVT_STC_MACRORECORD(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_MACRORECORD, fn)
+
+def EVT_STC_MARGINCLICK(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_MARGINCLICK, fn)
+
+def EVT_STC_NEEDSHOWN(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_NEEDSHOWN, fn)
+
+
+
+class wxStyledTextCtrlPtr(wxControlPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetText(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetText,(self,) + _args, _kwargs)
+        return val
+    def SetText(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetText,(self,) + _args, _kwargs)
+        return val
+    def GetLine(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetLine,(self,) + _args, _kwargs)
+        return val
+    def ReplaceSelection(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_ReplaceSelection,(self,) + _args, _kwargs)
+        return val
+    def SetReadOnly(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetReadOnly,(self,) + _args, _kwargs)
+        return val
+    def GetReadOnly(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetReadOnly,(self,) + _args, _kwargs)
+        return val
+    def GetTextRange(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetTextRange,(self,) + _args, _kwargs)
+        return val
+    def GetStyledTextRange(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetStyledTextRange,(self,) + _args, _kwargs)
+        return val
+    def AddText(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_AddText,(self,) + _args, _kwargs)
+        return val
+    def AddStyledText(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_AddStyledText,(self,) + _args, _kwargs)
+        return val
+    def InsertText(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_InsertText,(self,) + _args, _kwargs)
+        return val
+    def ClearAll(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_ClearAll,(self,) + _args, _kwargs)
+        return val
+    def GetCharAt(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetCharAt,(self,) + _args, _kwargs)
+        return val
+    def GetStyleAt(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetStyleAt,(self,) + _args, _kwargs)
+        return val
+    def SetStyleBits(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetStyleBits,(self,) + _args, _kwargs)
+        return val
+    def GetStyleBits(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetStyleBits,(self,) + _args, _kwargs)
+        return val
+    def Cut(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_Cut,(self,) + _args, _kwargs)
+        return val
+    def Copy(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_Copy,(self,) + _args, _kwargs)
+        return val
+    def Paste(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_Paste,(self,) + _args, _kwargs)
+        return val
+    def CanPaste(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_CanPaste,(self,) + _args, _kwargs)
+        return val
+    def ClearClipbrd(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_ClearClipbrd,(self,) + _args, _kwargs)
+        return val
+    def Undo(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_Undo,(self,) + _args, _kwargs)
+        return val
+    def CanUndo(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_CanUndo,(self,) + _args, _kwargs)
+        return val
+    def EmptyUndoBuffer(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_EmptyUndoBuffer,(self,) + _args, _kwargs)
+        return val
+    def Redo(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_Redo,(self,) + _args, _kwargs)
+        return val
+    def CanRedo(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_CanRedo,(self,) + _args, _kwargs)
+        return val
+    def SetUndoCollection(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetUndoCollection,(self,) + _args, _kwargs)
+        return val
+    def GetUndoCollection(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetUndoCollection,(self,) + _args, _kwargs)
+        return val
+    def BeginUndoAction(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_BeginUndoAction,(self,) + _args, _kwargs)
+        return val
+    def EndUndoAction(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_EndUndoAction,(self,) + _args, _kwargs)
+        return val
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetSelection,(self,) + _args, _kwargs)
+        return val
+    def SetSelection(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetSelection,(self,) + _args, _kwargs)
+        return val
+    def GetSelectedText(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetSelectedText,(self,) + _args, _kwargs)
+        return val
+    def HideSelection(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_HideSelection,(self,) + _args, _kwargs)
+        return val
+    def GetHideSelection(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetHideSelection,(self,) + _args, _kwargs)
+        return val
+    def GetTextLength(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetTextLength,(self,) + _args, _kwargs)
+        return val
+    def GetFirstVisibleLine(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetFirstVisibleLine,(self,) + _args, _kwargs)
+        return val
+    def GetModified(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetModified,(self,) + _args, _kwargs)
+        return val
+    def GetLineCount(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetLineCount,(self,) + _args, _kwargs)
+        return val
+    def GetRect(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetRect,(self,) + _args, _kwargs)
+        if val: val = wxRectPtr(val) ; val.thisown = 1
+        return val
+    def GetLineFromPos(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetLineFromPos,(self,) + _args, _kwargs)
+        return val
+    def GetLineStartPos(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetLineStartPos,(self,) + _args, _kwargs)
+        return val
+    def GetLineLengthAtPos(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetLineLengthAtPos,(self,) + _args, _kwargs)
+        return val
+    def GetLineLength(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetLineLength,(self,) + _args, _kwargs)
+        return val
+    def GetCurrentLineText(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetCurrentLineText,(self,) + _args, _kwargs)
+        return val
+    def GetCurrentLine(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetCurrentLine,(self,) + _args, _kwargs)
+        return val
+    def PositionFromPoint(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_PositionFromPoint,(self,) + _args, _kwargs)
+        return val
+    def LineFromPoint(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_LineFromPoint,(self,) + _args, _kwargs)
+        return val
+    def PointFromPosition(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_PointFromPosition,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1
+        return val
+    def GetCurrentPos(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetCurrentPos,(self,) + _args, _kwargs)
+        return val
+    def GetAnchor(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetAnchor,(self,) + _args, _kwargs)
+        return val
+    def SelectAll(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SelectAll,(self,) + _args, _kwargs)
+        return val
+    def SetCurrentPosition(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetCurrentPosition,(self,) + _args, _kwargs)
+        return val
+    def SetAnchor(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetAnchor,(self,) + _args, _kwargs)
+        return val
+    def GotoPos(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GotoPos,(self,) + _args, _kwargs)
+        return val
+    def GotoLine(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GotoLine,(self,) + _args, _kwargs)
+        return val
+    def ChangePosition(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_ChangePosition,(self,) + _args, _kwargs)
+        return val
+    def PageMove(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_PageMove,(self,) + _args, _kwargs)
+        return val
+    def ScrollBy(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_ScrollBy,(self,) + _args, _kwargs)
+        return val
+    def ScrollToLine(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_ScrollToLine,(self,) + _args, _kwargs)
+        return val
+    def ScrollToColumn(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_ScrollToColumn,(self,) + _args, _kwargs)
+        return val
+    def EnsureCaretVisible(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_EnsureCaretVisible,(self,) + _args, _kwargs)
+        return val
+    def SetCaretPolicy(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetCaretPolicy,(self,) + _args, _kwargs)
+        return val
+    def GetSelectionType(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetSelectionType,(self,) + _args, _kwargs)
+        return val
+    def GetLinesOnScreen(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetLinesOnScreen,(self,) + _args, _kwargs)
+        return val
+    def IsSelectionRectangle(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_IsSelectionRectangle,(self,) + _args, _kwargs)
+        return val
+    def SetUseHorizontalScrollBar(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetUseHorizontalScrollBar,(self,) + _args, _kwargs)
+        return val
+    def GetUseHorizontalScrollBar(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetUseHorizontalScrollBar,(self,) + _args, _kwargs)
+        return val
+    def FindText(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_FindText,(self,) + _args, _kwargs)
+        return val
+    def SearchAnchor(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SearchAnchor,(self,) + _args, _kwargs)
+        return val
+    def SearchNext(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SearchNext,(self,) + _args, _kwargs)
+        return val
+    def SearchPrev(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SearchPrev,(self,) + _args, _kwargs)
+        return val
+    def GetViewWhitespace(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetViewWhitespace,(self,) + _args, _kwargs)
+        return val
+    def SetViewWhitespace(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetViewWhitespace,(self,) + _args, _kwargs)
+        return val
+    def GetEOLMode(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetEOLMode,(self,) + _args, _kwargs)
+        return val
+    def SetEOLMode(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetEOLMode,(self,) + _args, _kwargs)
+        return val
+    def GetViewEOL(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetViewEOL,(self,) + _args, _kwargs)
+        return val
+    def SetViewEOL(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetViewEOL,(self,) + _args, _kwargs)
+        return val
+    def ConvertEOL(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_ConvertEOL,(self,) + _args, _kwargs)
+        return val
+    def GetEndStyled(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetEndStyled,(self,) + _args, _kwargs)
+        return val
+    def StartStyling(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_StartStyling,(self,) + _args, _kwargs)
+        return val
+    def SetStyleFor(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetStyleFor,(self,) + _args, _kwargs)
+        return val
+    def SetStyleBytes(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetStyleBytes,(self,) + _args, _kwargs)
+        return val
+    def SetLineState(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetLineState,(self,) + _args, _kwargs)
+        return val
+    def GetLineState(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetLineState,(self,) + _args, _kwargs)
+        return val
+    def StyleClearAll(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_StyleClearAll,(self,) + _args, _kwargs)
+        return val
+    def StyleResetDefault(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_StyleResetDefault,(self,) + _args, _kwargs)
+        return val
+    def StyleSetSpec(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_StyleSetSpec,(self,) + _args, _kwargs)
+        return val
+    def StyleSetForeground(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_StyleSetForeground,(self,) + _args, _kwargs)
+        return val
+    def StyleSetBackground(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_StyleSetBackground,(self,) + _args, _kwargs)
+        return val
+    def StyleSetFont(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_StyleSetFont,(self,) + _args, _kwargs)
+        return val
+    def StyleSetFontAttr(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_StyleSetFontAttr,(self,) + _args, _kwargs)
+        return val
+    def StyleSetBold(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_StyleSetBold,(self,) + _args, _kwargs)
+        return val
+    def StyleSetItalic(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_StyleSetItalic,(self,) + _args, _kwargs)
+        return val
+    def StyleSetFaceName(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_StyleSetFaceName,(self,) + _args, _kwargs)
+        return val
+    def StyleSetSize(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_StyleSetSize,(self,) + _args, _kwargs)
+        return val
+    def StyleSetEOLFilled(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_StyleSetEOLFilled,(self,) + _args, _kwargs)
+        return val
+    def GetLeftMargin(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetLeftMargin,(self,) + _args, _kwargs)
+        return val
+    def GetRightMargin(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetRightMargin,(self,) + _args, _kwargs)
+        return val
+    def SetMargins(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetMargins,(self,) + _args, _kwargs)
+        return val
+    def SetMarginType(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetMarginType,(self,) + _args, _kwargs)
+        return val
+    def GetMarginType(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetMarginType,(self,) + _args, _kwargs)
+        return val
+    def SetMarginWidth(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetMarginWidth,(self,) + _args, _kwargs)
+        return val
+    def GetMarginWidth(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetMarginWidth,(self,) + _args, _kwargs)
+        return val
+    def SetMarginMask(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetMarginMask,(self,) + _args, _kwargs)
+        return val
+    def GetMarginMask(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetMarginMask,(self,) + _args, _kwargs)
+        return val
+    def SetMarginSensitive(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetMarginSensitive,(self,) + _args, _kwargs)
+        return val
+    def GetMarginSensitive(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetMarginSensitive,(self,) + _args, _kwargs)
+        return val
+    def SetSelectionForeground(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetSelectionForeground,(self,) + _args, _kwargs)
+        return val
+    def SetSelectionBackground(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetSelectionBackground,(self,) + _args, _kwargs)
+        return val
+    def SetCaretForeground(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetCaretForeground,(self,) + _args, _kwargs)
+        return val
+    def GetCaretPeriod(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetCaretPeriod,(self,) + _args, _kwargs)
+        return val
+    def SetCaretPeriod(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetCaretPeriod,(self,) + _args, _kwargs)
+        return val
+    def SetBufferedDraw(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetBufferedDraw,(self,) + _args, _kwargs)
+        return val
+    def SetTabWidth(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetTabWidth,(self,) + _args, _kwargs)
+        return val
+    def SetIndent(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetIndent,(self,) + _args, _kwargs)
+        return val
+    def SetUseTabs(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetUseTabs,(self,) + _args, _kwargs)
+        return val
+    def SetLineIndentation(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetLineIndentation,(self,) + _args, _kwargs)
+        return val
+    def GetLineIndentation(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetLineIndentation,(self,) + _args, _kwargs)
+        return val
+    def GetLineIndentationPos(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetLineIndentationPos,(self,) + _args, _kwargs)
+        return val
+    def SetWordChars(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetWordChars,(self,) + _args, _kwargs)
+        return val
+    def SetUsePop(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetUsePop,(self,) + _args, _kwargs)
+        return val
+    def BraceHighlight(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_BraceHighlight,(self,) + _args, _kwargs)
+        return val
+    def BraceBadlight(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_BraceBadlight,(self,) + _args, _kwargs)
+        return val
+    def BraceMatch(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_BraceMatch,(self,) + _args, _kwargs)
+        return val
+    def MarkerDefine(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_MarkerDefine,(self,) + _args, _kwargs)
+        return val
+    def MarkerSetType(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_MarkerSetType,(self,) + _args, _kwargs)
+        return val
+    def MarkerSetForeground(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_MarkerSetForeground,(self,) + _args, _kwargs)
+        return val
+    def MarkerSetBackground(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_MarkerSetBackground,(self,) + _args, _kwargs)
+        return val
+    def MarkerAdd(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_MarkerAdd,(self,) + _args, _kwargs)
+        return val
+    def MarkerDelete(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_MarkerDelete,(self,) + _args, _kwargs)
+        return val
+    def MarkerDeleteAll(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_MarkerDeleteAll,(self,) + _args, _kwargs)
+        return val
+    def MarkerGet(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_MarkerGet,(self,) + _args, _kwargs)
+        return val
+    def MarkerGetNextLine(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_MarkerGetNextLine,(self,) + _args, _kwargs)
+        return val
+    def MarkerGetPrevLine(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_MarkerGetPrevLine,(self,) + _args, _kwargs)
+        return val
+    def MarkerLineFromHandle(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_MarkerLineFromHandle,(self,) + _args, _kwargs)
+        return val
+    def MarkerDeleteHandle(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_MarkerDeleteHandle,(self,) + _args, _kwargs)
+        return val
+    def IndicatorSetStyle(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_IndicatorSetStyle,(self,) + _args, _kwargs)
+        return val
+    def IndicatorGetStyle(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_IndicatorGetStyle,(self,) + _args, _kwargs)
+        return val
+    def IndicatorSetColour(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_IndicatorSetColour,(self,) + _args, _kwargs)
+        return val
+    def AutoCompShow(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_AutoCompShow,(self,) + _args, _kwargs)
+        return val
+    def AutoCompCancel(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_AutoCompCancel,(self,) + _args, _kwargs)
+        return val
+    def AutoCompActive(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_AutoCompActive,(self,) + _args, _kwargs)
+        return val
+    def AutoCompPosAtStart(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_AutoCompPosAtStart,(self,) + _args, _kwargs)
+        return val
+    def AutoCompComplete(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_AutoCompComplete,(self,) + _args, _kwargs)
+        return val
+    def AutoCompStopChars(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_AutoCompStopChars,(self,) + _args, _kwargs)
+        return val
+    def AutoCompSetSeparator(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_AutoCompSetSeparator,(self,) + _args, _kwargs)
+        return val
+    def AutoCompGetSeparator(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_AutoCompGetSeparator,(self,) + _args, _kwargs)
+        return val
+    def AutoCompSelect(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_AutoCompSelect,(self,) + _args, _kwargs)
+        return val
+    def CallTipShow(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_CallTipShow,(self,) + _args, _kwargs)
+        return val
+    def CallTipCancel(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_CallTipCancel,(self,) + _args, _kwargs)
+        return val
+    def CallTipActive(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_CallTipActive,(self,) + _args, _kwargs)
+        return val
+    def CallTipPosAtStart(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_CallTipPosAtStart,(self,) + _args, _kwargs)
+        return val
+    def CallTipSetHighlight(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_CallTipSetHighlight,(self,) + _args, _kwargs)
+        return val
+    def CallTipSetBackground(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_CallTipSetBackground,(self,) + _args, _kwargs)
+        return val
+    def CmdKeyAssign(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_CmdKeyAssign,(self,) + _args, _kwargs)
+        return val
+    def CmdKeyClear(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_CmdKeyClear,(self,) + _args, _kwargs)
+        return val
+    def CmdKeyClearAll(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_CmdKeyClearAll,(self,) + _args, _kwargs)
+        return val
+    def CmdKeyExecute(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_CmdKeyExecute,(self,) + _args, _kwargs)
+        return val
+    def FormatRange(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_FormatRange,(self,) + _args, _kwargs)
+        return val
+    def GetDocument(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetDocument,(self,) + _args, _kwargs)
+        return val
+    def SetDocument(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetDocument,(self,) + _args, _kwargs)
+        return val
+    def VisibleFromDocLine(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_VisibleFromDocLine,(self,) + _args, _kwargs)
+        return val
+    def DocLineFromVisible(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_DocLineFromVisible,(self,) + _args, _kwargs)
+        return val
+    def SetFoldLevel(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetFoldLevel,(self,) + _args, _kwargs)
+        return val
+    def GetFoldLevel(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetFoldLevel,(self,) + _args, _kwargs)
+        return val
+    def GetLastChild(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetLastChild,(self,) + _args, _kwargs)
+        return val
+    def GetFoldParent(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetFoldParent,(self,) + _args, _kwargs)
+        return val
+    def ShowLines(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_ShowLines,(self,) + _args, _kwargs)
+        return val
+    def HideLines(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_HideLines,(self,) + _args, _kwargs)
+        return val
+    def GetLineVisible(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetLineVisible,(self,) + _args, _kwargs)
+        return val
+    def SetFoldExpanded(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetFoldExpanded,(self,) + _args, _kwargs)
+        return val
+    def GetFoldExpanded(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetFoldExpanded,(self,) + _args, _kwargs)
+        return val
+    def ToggleFold(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_ToggleFold,(self,) + _args, _kwargs)
+        return val
+    def EnsureVisible(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_EnsureVisible,(self,) + _args, _kwargs)
+        return val
+    def SetFoldFlags(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetFoldFlags,(self,) + _args, _kwargs)
+        return val
+    def GetEdgeColumn(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetEdgeColumn,(self,) + _args, _kwargs)
+        return val
+    def SetEdgeColumn(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetEdgeColumn,(self,) + _args, _kwargs)
+        return val
+    def GetEdgeMode(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetEdgeMode,(self,) + _args, _kwargs)
+        return val
+    def SetEdgeMode(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetEdgeMode,(self,) + _args, _kwargs)
+        return val
+    def GetEdgeColour(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetEdgeColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1
+        return val
+    def SetEdgeColour(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetEdgeColour,(self,) + _args, _kwargs)
+        return val
+    def SetLexer(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetLexer,(self,) + _args, _kwargs)
+        return val
+    def GetLexer(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_GetLexer,(self,) + _args, _kwargs)
+        return val
+    def Colourise(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_Colourise,(self,) + _args, _kwargs)
+        return val
+    def SetProperty(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetProperty,(self,) + _args, _kwargs)
+        return val
+    def SetKeywords(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_SetKeywords,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxStyledTextCtrl instance at %s>" % (self.this,)
+class wxStyledTextCtrl(wxStyledTextCtrlPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(stc_c.new_wxStyledTextCtrl,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxStyledTextEventPtr(wxCommandEventPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,stc_c=stc_c):
+        if self.thisown == 1 :
+            stc_c.delete_wxStyledTextEvent(self)
+    def SetPosition(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_SetPosition,(self,) + _args, _kwargs)
+        return val
+    def SetKey(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_SetKey,(self,) + _args, _kwargs)
+        return val
+    def SetModifiers(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_SetModifiers,(self,) + _args, _kwargs)
+        return val
+    def SetModificationType(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_SetModificationType,(self,) + _args, _kwargs)
+        return val
+    def SetText(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_SetText,(self,) + _args, _kwargs)
+        return val
+    def SetLength(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_SetLength,(self,) + _args, _kwargs)
+        return val
+    def SetLinesAdded(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_SetLinesAdded,(self,) + _args, _kwargs)
+        return val
+    def SetLine(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_SetLine,(self,) + _args, _kwargs)
+        return val
+    def SetFoldLevelNow(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_SetFoldLevelNow,(self,) + _args, _kwargs)
+        return val
+    def SetFoldLevelPrev(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_SetFoldLevelPrev,(self,) + _args, _kwargs)
+        return val
+    def SetMargin(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_SetMargin,(self,) + _args, _kwargs)
+        return val
+    def SetMessage(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_SetMessage,(self,) + _args, _kwargs)
+        return val
+    def SetWParam(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_SetWParam,(self,) + _args, _kwargs)
+        return val
+    def SetLParam(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_SetLParam,(self,) + _args, _kwargs)
+        return val
+    def GetPosition(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_GetPosition,(self,) + _args, _kwargs)
+        return val
+    def GetKey(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_GetKey,(self,) + _args, _kwargs)
+        return val
+    def GetModifiers(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_GetModifiers,(self,) + _args, _kwargs)
+        return val
+    def GetModificationType(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_GetModificationType,(self,) + _args, _kwargs)
+        return val
+    def GetText(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_GetText,(self,) + _args, _kwargs)
+        return val
+    def GetLength(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_GetLength,(self,) + _args, _kwargs)
+        return val
+    def GetLinesAdded(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_GetLinesAdded,(self,) + _args, _kwargs)
+        return val
+    def GetLine(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_GetLine,(self,) + _args, _kwargs)
+        return val
+    def GetFoldLevelNow(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_GetFoldLevelNow,(self,) + _args, _kwargs)
+        return val
+    def GetFoldLevelPrev(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_GetFoldLevelPrev,(self,) + _args, _kwargs)
+        return val
+    def GetMargin(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_GetMargin,(self,) + _args, _kwargs)
+        return val
+    def GetMessage(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_GetMessage,(self,) + _args, _kwargs)
+        return val
+    def GetWParam(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_GetWParam,(self,) + _args, _kwargs)
+        return val
+    def GetLParam(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_GetLParam,(self,) + _args, _kwargs)
+        return val
+    def GetShift(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_GetShift,(self,) + _args, _kwargs)
+        return val
+    def GetControl(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_GetControl,(self,) + _args, _kwargs)
+        return val
+    def GetAlt(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_GetAlt,(self,) + _args, _kwargs)
+        return val
+    def CopyObject(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextEvent_CopyObject,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxStyledTextEvent instance at %s>" % (self.this,)
+class wxStyledTextEvent(wxStyledTextEventPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(stc_c.new_wxStyledTextEvent,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+
+
+#-------------- FUNCTION WRAPPERS ------------------
+
+
+
+#-------------- VARIABLE WRAPPERS ------------------
+
+wxSTC_UndoCollectNone = stc_c.wxSTC_UndoCollectNone
+wxSTC_UndoCollectAutoStart = stc_c.wxSTC_UndoCollectAutoStart
+wxSTC_EOL_CRLF = stc_c.wxSTC_EOL_CRLF
+wxSTC_EOL_CR = stc_c.wxSTC_EOL_CR
+wxSTC_EOL_LF = stc_c.wxSTC_EOL_LF
+wxSTC_EDGE_NONE = stc_c.wxSTC_EDGE_NONE
+wxSTC_EDGE_LINE = stc_c.wxSTC_EDGE_LINE
+wxSTC_EDGE_BACKGROUND = stc_c.wxSTC_EDGE_BACKGROUND
+wxSTC_LEX_STYLE_MAX = stc_c.wxSTC_LEX_STYLE_MAX
+wxSTC_STYLE_DEFAULT = stc_c.wxSTC_STYLE_DEFAULT
+wxSTC_STYLE_LINENUMBER = stc_c.wxSTC_STYLE_LINENUMBER
+wxSTC_STYLE_BRACELIGHT = stc_c.wxSTC_STYLE_BRACELIGHT
+wxSTC_STYLE_BRACEBAD = stc_c.wxSTC_STYLE_BRACEBAD
+wxSTC_STYLE_CONTROLCHAR = stc_c.wxSTC_STYLE_CONTROLCHAR
+wxSTC_STYLE_MAX = stc_c.wxSTC_STYLE_MAX
+wxSTC_STYLE_MASK = stc_c.wxSTC_STYLE_MASK
+wxSTC_MARKER_MAX = stc_c.wxSTC_MARKER_MAX
+wxSTC_MARK_CIRCLE = stc_c.wxSTC_MARK_CIRCLE
+wxSTC_MARK_ROUNDRECT = stc_c.wxSTC_MARK_ROUNDRECT
+wxSTC_MARK_ARROW = stc_c.wxSTC_MARK_ARROW
+wxSTC_MARK_SMALLRECT = stc_c.wxSTC_MARK_SMALLRECT
+wxSTC_MARK_SHORTARROW = stc_c.wxSTC_MARK_SHORTARROW
+wxSTC_MARK_EMPTY = stc_c.wxSTC_MARK_EMPTY
+wxSTC_MARK_ARROWDOWN = stc_c.wxSTC_MARK_ARROWDOWN
+wxSTC_MARK_MINUS = stc_c.wxSTC_MARK_MINUS
+wxSTC_MARK_PLUS = stc_c.wxSTC_MARK_PLUS
+wxSTC_MARKNUM_FOLDER = stc_c.wxSTC_MARKNUM_FOLDER
+wxSTC_MARKNUM_FOLDEROPEN = stc_c.wxSTC_MARKNUM_FOLDEROPEN
+wxSTC_MASK_FOLDERS = stc_c.wxSTC_MASK_FOLDERS
+wxSTC_INDIC_MAX = stc_c.wxSTC_INDIC_MAX
+wxSTC_INDIC_PLAIN = stc_c.wxSTC_INDIC_PLAIN
+wxSTC_INDIC_SQUIGGLE = stc_c.wxSTC_INDIC_SQUIGGLE
+wxSTC_INDIC_TT = stc_c.wxSTC_INDIC_TT
+wxSTC_INDIC0_MASK = stc_c.wxSTC_INDIC0_MASK
+wxSTC_INDIC1_MASK = stc_c.wxSTC_INDIC1_MASK
+wxSTC_INDIC2_MASK = stc_c.wxSTC_INDIC2_MASK
+wxSTC_INDICS_MASK = stc_c.wxSTC_INDICS_MASK
+wxSTC_FOLDLEVELBASE = stc_c.wxSTC_FOLDLEVELBASE
+wxSTC_FOLDLEVELWHITEFLAG = stc_c.wxSTC_FOLDLEVELWHITEFLAG
+wxSTC_FOLDLEVELHEADERFLAG = stc_c.wxSTC_FOLDLEVELHEADERFLAG
+wxSTC_FOLDLEVELNUMBERMASK = stc_c.wxSTC_FOLDLEVELNUMBERMASK
+wxSTC_CMD_LINEDOWN = stc_c.wxSTC_CMD_LINEDOWN
+wxSTC_CMD_LINEDOWNEXTEND = stc_c.wxSTC_CMD_LINEDOWNEXTEND
+wxSTC_CMD_LINEUP = stc_c.wxSTC_CMD_LINEUP
+wxSTC_CMD_LINEUPEXTEND = stc_c.wxSTC_CMD_LINEUPEXTEND
+wxSTC_CMD_CHARLEFT = stc_c.wxSTC_CMD_CHARLEFT
+wxSTC_CMD_CHARLEFTEXTEND = stc_c.wxSTC_CMD_CHARLEFTEXTEND
+wxSTC_CMD_CHARRIGHT = stc_c.wxSTC_CMD_CHARRIGHT
+wxSTC_CMD_CHARRIGHTEXTEND = stc_c.wxSTC_CMD_CHARRIGHTEXTEND
+wxSTC_CMD_WORDLEFT = stc_c.wxSTC_CMD_WORDLEFT
+wxSTC_CMD_WORDLEFTEXTEND = stc_c.wxSTC_CMD_WORDLEFTEXTEND
+wxSTC_CMD_WORDRIGHT = stc_c.wxSTC_CMD_WORDRIGHT
+wxSTC_CMD_WORDRIGHTEXTEND = stc_c.wxSTC_CMD_WORDRIGHTEXTEND
+wxSTC_CMD_HOME = stc_c.wxSTC_CMD_HOME
+wxSTC_CMD_HOMEEXTEND = stc_c.wxSTC_CMD_HOMEEXTEND
+wxSTC_CMD_LINEEND = stc_c.wxSTC_CMD_LINEEND
+wxSTC_CMD_LINEENDEXTEND = stc_c.wxSTC_CMD_LINEENDEXTEND
+wxSTC_CMD_DOCUMENTSTART = stc_c.wxSTC_CMD_DOCUMENTSTART
+wxSTC_CMD_DOCUMENTSTARTEXTEND = stc_c.wxSTC_CMD_DOCUMENTSTARTEXTEND
+wxSTC_CMD_DOCUMENTEND = stc_c.wxSTC_CMD_DOCUMENTEND
+wxSTC_CMD_DOCUMENTENDEXTEND = stc_c.wxSTC_CMD_DOCUMENTENDEXTEND
+wxSTC_CMD_PAGEUP = stc_c.wxSTC_CMD_PAGEUP
+wxSTC_CMD_PAGEUPEXTEND = stc_c.wxSTC_CMD_PAGEUPEXTEND
+wxSTC_CMD_PAGEDOWN = stc_c.wxSTC_CMD_PAGEDOWN
+wxSTC_CMD_PAGEDOWNEXTEND = stc_c.wxSTC_CMD_PAGEDOWNEXTEND
+wxSTC_CMD_EDITTOGGLEOVERTYPE = stc_c.wxSTC_CMD_EDITTOGGLEOVERTYPE
+wxSTC_CMD_CANCEL = stc_c.wxSTC_CMD_CANCEL
+wxSTC_CMD_DELETEBACK = stc_c.wxSTC_CMD_DELETEBACK
+wxSTC_CMD_TAB = stc_c.wxSTC_CMD_TAB
+wxSTC_CMD_BACKTAB = stc_c.wxSTC_CMD_BACKTAB
+wxSTC_CMD_NEWLINE = stc_c.wxSTC_CMD_NEWLINE
+wxSTC_CMD_FORMFEED = stc_c.wxSTC_CMD_FORMFEED
+wxSTC_CMD_VCHOME = stc_c.wxSTC_CMD_VCHOME
+wxSTC_CMD_VCHOMEEXTEND = stc_c.wxSTC_CMD_VCHOMEEXTEND
+wxSTC_CMD_ZOOMIN = stc_c.wxSTC_CMD_ZOOMIN
+wxSTC_CMD_ZOOMOUT = stc_c.wxSTC_CMD_ZOOMOUT
+wxSTC_CMD_DELWORDLEFT = stc_c.wxSTC_CMD_DELWORDLEFT
+wxSTC_CMD_DELWORDRIGHT = stc_c.wxSTC_CMD_DELWORDRIGHT
+wxSTC_CMD_LINECUT = stc_c.wxSTC_CMD_LINECUT
+wxSTC_CMD_LINEDELETE = stc_c.wxSTC_CMD_LINEDELETE
+wxSTC_CMD_LINETRANSPOSE = stc_c.wxSTC_CMD_LINETRANSPOSE
+wxSTC_CMD_LOWERCASE = stc_c.wxSTC_CMD_LOWERCASE
+wxSTC_CMD_UPPERCASE = stc_c.wxSTC_CMD_UPPERCASE
+wxSTC_CMD_LINESCROLLDOWN = stc_c.wxSTC_CMD_LINESCROLLDOWN
+wxSTC_CMD_LINESCROLLUP = stc_c.wxSTC_CMD_LINESCROLLUP
+wxSTC_LEX_CONTAINER = stc_c.wxSTC_LEX_CONTAINER
+wxSTC_LEX_NULL = stc_c.wxSTC_LEX_NULL
+wxSTC_LEX_PYTHON = stc_c.wxSTC_LEX_PYTHON
+wxSTC_LEX_CPP = stc_c.wxSTC_LEX_CPP
+wxSTC_LEX_HTML = stc_c.wxSTC_LEX_HTML
+wxSTC_LEX_XML = stc_c.wxSTC_LEX_XML
+wxSTC_LEX_PERL = stc_c.wxSTC_LEX_PERL
+wxSTC_LEX_SQL = stc_c.wxSTC_LEX_SQL
+wxSTC_LEX_VB = stc_c.wxSTC_LEX_VB
+wxSTC_LEX_PROPERTIES = stc_c.wxSTC_LEX_PROPERTIES
+wxSTC_LEX_ERRORLIST = stc_c.wxSTC_LEX_ERRORLIST
+wxSTC_LEX_MAKEFILE = stc_c.wxSTC_LEX_MAKEFILE
+wxSTC_LEX_BATCH = stc_c.wxSTC_LEX_BATCH
+wxSTC_CARET_SLOP = stc_c.wxSTC_CARET_SLOP
+WXSTC_CARET_CENTER = stc_c.WXSTC_CARET_CENTER
+wxSTC_CARET_STRICT = stc_c.wxSTC_CARET_STRICT
+wxSTC_MARGIN_SYMBOL = stc_c.wxSTC_MARGIN_SYMBOL
+wxSTC_MARGIN_NUMBER = stc_c.wxSTC_MARGIN_NUMBER
+wxSTCNameStr = stc_c.wxSTCNameStr
+wxEVT_STC_CHANGE = stc_c.wxEVT_STC_CHANGE
+wxEVT_STC_STYLENEEDED = stc_c.wxEVT_STC_STYLENEEDED
+wxEVT_STC_CHARADDED = stc_c.wxEVT_STC_CHARADDED
+wxEVT_STC_UPDATEUI = stc_c.wxEVT_STC_UPDATEUI
+wxEVT_STC_SAVEPOINTREACHED = stc_c.wxEVT_STC_SAVEPOINTREACHED
+wxEVT_STC_SAVEPOINTLEFT = stc_c.wxEVT_STC_SAVEPOINTLEFT
+wxEVT_STC_ROMODIFYATTEMPT = stc_c.wxEVT_STC_ROMODIFYATTEMPT
+wxEVT_STC_DOUBLECLICK = stc_c.wxEVT_STC_DOUBLECLICK
+wxEVT_STC_MODIFIED = stc_c.wxEVT_STC_MODIFIED
+wxEVT_STC_KEY = stc_c.wxEVT_STC_KEY
+wxEVT_STC_MACRORECORD = stc_c.wxEVT_STC_MACRORECORD
+wxEVT_STC_MARGINCLICK = stc_c.wxEVT_STC_MARGINCLICK
+wxEVT_STC_NEEDSHOWN = stc_c.wxEVT_STC_NEEDSHOWN
+
+
+#-------------- USER INCLUDE -----------------------
+
+# Stuff these names into the wx namespace so wxPyConstructObject can find them
+
+wx.wxStyledTextEventPtr       = wxStyledTextEventPtr