install activex too

[wxWidgets.git] / wxPython / contrib / ogl / _oglbasic.i

diff --git a/wxPython/contrib/ogl/_oglbasic.i b/wxPython/contrib/ogl/_oglbasic.i
index 334cc093c0d81c7db2a4f86c70709082e313c4f2..77b308fbe278bf307fcf076110667896a4da0e0c 100644 (file)
--- a/wxPython/contrib/ogl/_oglbasic.i
+++ b/wxPython/contrib/ogl/_oglbasic.i
@@ -42,7 +42,7 @@ public:
     int GetFormatMode();
     wxString GetName();
     wxString GetColour();
     int GetFormatMode();
     wxString GetName();
     wxString GetColour();

-    wxColour *GetActualColourObject();
+    wxColour GetActualColourObject();

     wxList& GetFormattedText();
     wxString GetPenColour();
     int GetPenStyle();
     wxList& GetFormattedText();
     wxString GetPenColour();
     int GetPenStyle();


@@ -81,7 +81,7 @@ public:
 
 class wxPyShapeEvtHandler : public wxObject {
 public:
 
 class wxPyShapeEvtHandler : public wxObject {
 public:

-    %addtofunc wxPyShapeEvtHandler "self._setOORandCallbackInfo(PyShapeEvtHandler)"
+    %pythonAppend wxPyShapeEvtHandler "self._setOORandCallbackInfo(PyShapeEvtHandler)"

     
     wxPyShapeEvtHandler(wxPyShapeEvtHandler *prev = NULL,
                         wxPyShape *shape = NULL);
     
     wxPyShapeEvtHandler(wxPyShapeEvtHandler *prev = NULL,
                         wxPyShape *shape = NULL);


@@ -145,7 +145,7 @@ public:
 
 class wxPyShape : public wxPyShapeEvtHandler {
 public:
 
 class wxPyShape : public wxPyShapeEvtHandler {
 public:

-    %addtofunc wxPyShape "self._setOORandCallbackInfo(PyShapeEvtHandler)"
+    %pythonAppend wxPyShape "self._setOORandCallbackInfo(PyShapeEvtHandler)"

     
     wxPyShape(wxPyShapeCanvas *can = NULL);  
 
     
     wxPyShape(wxPyShapeCanvas *can = NULL);