An implementation of wxPen.GetDashes.

wxSplitterEvent derives from wxNotifyEvent.

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

diff --git a/wxPython/src/gdi.i b/wxPython/src/gdi.i
index b598610491b4d61cf4d54b91ed67d9491764a822..fa57df3de3da7bb729f156d609bb3c83dfebc763 100644 (file)
--- a/wxPython/src/gdi.i
+++ b/wxPython/src/gdi.i
@@ -423,9 +423,21 @@ public:
     void SetStyle(int style);
     void SetWidth(int width);
 
-            // **** This one needs to return a list of ints (wxDash)
-    //int GetDashes(wxDash **dashes);
+
     void SetDashes(int LCOUNT, wxDash* choices);
+    //int GetDashes(wxDash **dashes);
+    %addmethods {
+        PyObject* GetDashes() {
+            wxDash* dashes;
+            int count = self->GetDashes(&dashes);
+            wxPyBeginBlockThreads();
+            PyObject* retval = PyList_New(0);
+            for (int x=0; x<count; x++)
+                PyList_Append(retval, PyInt_FromLong(dashes[x]));
+            wxPyEndBlockThreads();
+            return retval;
+        }
+    }
 
 #ifdef __WXMSW__
     wxBitmap* GetStipple();

diff --git a/wxPython/src/msw/gdi.cpp b/wxPython/src/msw/gdi.cpp
index 893ab0544ba555a9c87721b353397989485c29f8..d5d14a3c2305d8b41217324b189c43ae07bbc8f6 100644 (file)
--- a/wxPython/src/msw/gdi.cpp
+++ b/wxPython/src/msw/gdi.cpp
@@ -4236,6 +4236,45 @@ static PyObject *_wrap_wxPen_SetDashes(PyObject *self, PyObject *args, PyObject
     return _resultobj;
 }
 
+static PyObject * wxPen_GetDashes(wxPen *self) {
+            wxDash* dashes;
+            int count = self->GetDashes(&dashes);
+            wxPyBeginBlockThreads();
+            PyObject* retval = PyList_New(0);
+            for (int x=0; x<count; x++)
+                PyList_Append(retval, PyInt_FromLong(dashes[x]));
+            wxPyEndBlockThreads();
+            return retval;
+        }
+static PyObject *_wrap_wxPen_GetDashes(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    PyObject * _result;
+    wxPen * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPen_GetDashes",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPen_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPen_GetDashes. Expected _wxPen_p.");
+        return NULL;
+        }
+    }
+{
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    _result = (PyObject *)wxPen_GetDashes(_arg0);
+
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;
+}{
+  _resultobj = _result;
+}
+    return _resultobj;
+}
+
 #define wxPen_GetStipple(_swigobj)  (_swigobj->GetStipple())
 static PyObject *_wrap_wxPen_GetStipple(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
@@ -11327,6 +11366,7 @@ static PyMethodDef gdicMethods[] = {
         { "new_wxPyPen", (PyCFunction) _wrap_new_wxPyPen, METH_VARARGS | METH_KEYWORDS },
         { "wxPen_SetStipple", (PyCFunction) _wrap_wxPen_SetStipple, METH_VARARGS | METH_KEYWORDS },
         { "wxPen_GetStipple", (PyCFunction) _wrap_wxPen_GetStipple, METH_VARARGS | METH_KEYWORDS },
+        { "wxPen_GetDashes", (PyCFunction) _wrap_wxPen_GetDashes, METH_VARARGS | METH_KEYWORDS },
         { "wxPen_SetDashes", (PyCFunction) _wrap_wxPen_SetDashes, METH_VARARGS | METH_KEYWORDS },
         { "wxPen_SetWidth", (PyCFunction) _wrap_wxPen_SetWidth, METH_VARARGS | METH_KEYWORDS },
         { "wxPen_SetStyle", (PyCFunction) _wrap_wxPen_SetStyle, METH_VARARGS | METH_KEYWORDS },

diff --git a/wxPython/src/msw/gdi.py b/wxPython/src/msw/gdi.py
index 9ab2cec48ff89a0bdd4c6e3d553fe587c09af31b..a4ba1aa667e22e8aee5f5ead2136c1dbee7b02a3 100644 (file)
--- a/wxPython/src/msw/gdi.py
+++ b/wxPython/src/msw/gdi.py
@@ -388,6 +388,9 @@ class wxPenPtr(wxGDIObjectPtr):
     def SetDashes(self, *_args, **_kwargs):
         val = apply(gdic.wxPen_SetDashes,(self,) + _args, _kwargs)
         return val
+    def GetDashes(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_GetDashes,(self,) + _args, _kwargs)
+        return val
     def GetStipple(self, *_args, **_kwargs):
         val = apply(gdic.wxPen_GetStipple,(self,) + _args, _kwargs)
         if val: val = wxBitmapPtr(val) 

diff --git a/wxPython/src/msw/windows2.cpp b/wxPython/src/msw/windows2.cpp
index 5b95846b6ef4be98942bdb490df8bf8a3d4c7dbd..9c2635f7378e460ff91ac076b4c773000c3fb071 100644 (file)
--- a/wxPython/src/msw/windows2.cpp
+++ b/wxPython/src/msw/windows2.cpp
@@ -1177,6 +1177,14 @@ static PyObject *_wrap_wxNotebook_ResizeChildren(PyObject *self, PyObject *args,
     return _resultobj;
 }
 
+static void *SwigwxSplitterEventTowxNotifyEvent(void *ptr) {
+    wxSplitterEvent *src;
+    wxNotifyEvent *dest;
+    src = (wxSplitterEvent *) ptr;
+    dest = (wxNotifyEvent *) src;
+    return (void *) dest;
+}
+
 static void *SwigwxSplitterEventTowxCommandEvent(void *ptr) {
     wxSplitterEvent *src;
     wxCommandEvent *dest;
@@ -2565,6 +2573,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxPrintQuality","_EBool",0},
     { "_wxPrintQuality","_size_t",0},
     { "_wxPrintQuality","_time_t",0},
+    { "_wxNotifyEvent","_wxSplitterEvent",SwigwxSplitterEventTowxNotifyEvent},
     { "_wxNotifyEvent","_wxNotebookEvent",SwigwxNotebookEventTowxNotifyEvent},
     { "_byte","_unsigned_char",0},
     { "_long","_unsigned_long",0},

diff --git a/wxPython/src/msw/windows2.py b/wxPython/src/msw/windows2.py
index 7d9bbd105fcbb0e02a82a4b43c05637980003342..39f8b3bbd1953ca00dc8f0ad5da3d5ac72ac2ee2 100644 (file)
--- a/wxPython/src/msw/windows2.py
+++ b/wxPython/src/msw/windows2.py
@@ -129,7 +129,7 @@ def wxPreNotebook(*_args,**_kwargs):
     return val
 
 
-class wxSplitterEventPtr(wxCommandEventPtr):
+class wxSplitterEventPtr(wxNotifyEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0

diff --git a/wxPython/src/windows2.i b/wxPython/src/windows2.i
index ba38a8a43a6eb469fa7b1889730d5d767e7718a8..3183aca7cf88930f15e7fe9d9847b383622537e7 100644 (file)
--- a/wxPython/src/windows2.i
+++ b/wxPython/src/windows2.i
@@ -158,7 +158,7 @@ enum
 };
 
 
-class wxSplitterEvent : public wxCommandEvent {
+class wxSplitterEvent : public wxNotifyEvent {
 public:
      wxSplitterEvent(wxEventType type = wxEVT_NULL,
                      wxSplitterWindow *splitter = NULL);