reSWIGged

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

diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py
index 203dd9bb3cb142e5282d358e841bd080d31f514f..90b1f7df19094aee086b72ea0ef113f0f7f6538c 100644 (file)
--- a/wxPython/src/msw/_core.py
+++ b/wxPython/src/msw/_core.py
@@ -1322,11 +1322,19 @@ class Point2D(object):
         self.thisown = 1
         del newobj.thisown
     def GetFloor(*args, **kwargs):
-        """GetFloor() -> (x,y)"""
+        """
+        GetFloor() -> (x,y)
+
+        Convert to integer
+        """
         return _core_.Point2D_GetFloor(*args, **kwargs)
 
     def GetRounded(*args, **kwargs):
-        """GetRounded() -> (x,y)"""
+        """
+        GetRounded() -> (x,y)
+
+        Convert to integer
+        """
         return _core_.Point2D_GetRounded(*args, **kwargs)
 
     def GetVectorLength(*args, **kwargs):
@@ -1950,7 +1958,13 @@ class ImageHistogram(object):
 
     MakeKey = staticmethod(MakeKey)
     def FindFirstUnusedColour(*args, **kwargs):
-        """FindFirstUnusedColour(int startR=1, int startG=0, int startB=0) -> (success, r, g, b)"""
+        """
+        FindFirstUnusedColour(int startR=1, int startG=0, int startB=0) -> (success, r, g, b)
+
+        Find first colour that is not used in the image and has higher RGB
+        values than startR, startG, startB.  Returns a tuple consisting of a
+        success flag and rgb values.
+        """
         return _core_.ImageHistogram_FindFirstUnusedColour(*args, **kwargs)
 
 
@@ -2037,7 +2051,13 @@ class Image(Object):
         return _core_.Image_HasAlpha(*args, **kwargs)
 
     def FindFirstUnusedColour(*args, **kwargs):
-        """FindFirstUnusedColour(int startR=1, int startG=0, int startB=0) -> (success, r, g, b)"""
+        """
+        FindFirstUnusedColour(int startR=1, int startG=0, int startB=0) -> (success, r, g, b)
+
+        Find first colour that is not used in the image and has higher RGB
+        values than startR, startG, startB.  Returns a tuple consisting of a
+        success flag and rgb values.
+        """
         return _core_.Image_FindFirstUnusedColour(*args, **kwargs)
 
     def SetMaskFromImage(*args, **kwargs):
@@ -6220,21 +6240,8 @@ class Window(EvtHandler):
         """
         Navigate(self, int flags=NavigationKeyEvent.IsForward) -> bool
 
-        :param flags: A combination of the ``IsForward`` and ``WinChange``
-                      values in the `wx.NavigationKeyEvent` class, which
-                      determine if the navigation should be in forward or
-                      reverse order, and if it should be able to cross
-                      parent window boundaries, such as between notebook
-                      pages or MDI child frames.  Typically the status of
-                      the Shift key (for forward or reverse) or the
-                      Control key (for WinChange) would be used to
-                      determine how to set the flags.
-
-        situation in which you may wish to call this method is from a text
-        rol custom keypress handler to do the default navigation behaviour
-        the tab key, since the standard default behaviour for a multiline
-         control with the wx.TE_PROCESS_TAB style is to insert a tab and
-        navigate to the next control.
+        Does keyboard navigation from this window to another, by sending a
+        `wx.NavigationKeyEvent`.
         """
         return _core_.Window_Navigate(*args, **kwargs)
 
@@ -6888,7 +6895,11 @@ class Window(EvtHandler):
         return _core_.Window_GetCharWidth(*args, **kwargs)
 
     def GetTextExtent(*args, **kwargs):
-        """GetTextExtent(String string) -> (width, height)"""
+        """
+        GetTextExtent(String string) -> (width, height)
+
+        Get the width and height of the text using the current font.
+        """
         return _core_.Window_GetTextExtent(*args, **kwargs)
 
     def GetFullTextExtent(*args, **kwargs):
@@ -9552,11 +9563,21 @@ class FlexGridSizer(GridSizer):
         return _core_.FlexGridSizer_GetNonFlexibleGrowMode(*args, **kwargs)
 
     def GetRowHeights(*args, **kwargs):
-        """GetRowHeights(self) -> list"""
+        """
+        GetRowHeights(self) -> list
+
+        Returns a list of integers representing the heights of each of the
+        rows in the sizer.
+        """
         return _core_.FlexGridSizer_GetRowHeights(*args, **kwargs)
 
     def GetColWidths(*args, **kwargs):
-        """GetColWidths(self) -> list"""
+        """
+        GetColWidths(self) -> list
+
+        Returns a list of integers representing the widths of each of the
+        columns in the sizer.
+        """
         return _core_.FlexGridSizer_GetColWidths(*args, **kwargs)
 
 

diff --git a/wxPython/src/msw/grid.py b/wxPython/src/msw/grid.py
index 8caf74ef978d986c7bcc7a765810bbba89d51d40..30237ab5f3bd42db44e52f83e00fd441b501c84b 100644 (file)
--- a/wxPython/src/msw/grid.py
+++ b/wxPython/src/msw/grid.py
@@ -708,6 +708,10 @@ class GridCellAttr(object):
         """IsReadOnly(self) -> bool"""
         return _grid.GridCellAttr_IsReadOnly(*args, **kwargs)
 
+    def GetKind(*args, **kwargs):
+        """GetKind(self) -> int"""
+        return _grid.GridCellAttr_GetKind(*args, **kwargs)
+
     def SetDefAttr(*args, **kwargs):
         """SetDefAttr(self, GridCellAttr defAttr)"""
         return _grid.GridCellAttr_SetDefAttr(*args, **kwargs)

diff --git a/wxPython/src/msw/grid_wrap.cpp b/wxPython/src/msw/grid_wrap.cpp
index a3bdc540104518163e1b951545c92741157938d4..1ee05fc6a8f44e244b960ef0a1339d45629f6c78 100644 (file)
--- a/wxPython/src/msw/grid_wrap.cpp
+++ b/wxPython/src/msw/grid_wrap.cpp
@@ -4779,6 +4779,32 @@ static PyObject *_wrap_GridCellAttr_IsReadOnly(PyObject *self, PyObject *args, P
 }
 
 
+static PyObject *_wrap_GridCellAttr_GetKind(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
+    int result;
+    PyObject * obj0 = 0 ;
+    char *kwnames[] = {
+        (char *) "self", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridCellAttr_GetKind",kwnames,&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellAttr,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        result = (int)(arg1)->GetKind();
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    resultobj = SWIG_FromInt((int)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
 static PyObject *_wrap_GridCellAttr_SetDefAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
@@ -15710,6 +15736,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"GridCellAttr_GetRenderer", (PyCFunction) _wrap_GridCellAttr_GetRenderer, METH_VARARGS | METH_KEYWORDS },
         { (char *)"GridCellAttr_GetEditor", (PyCFunction) _wrap_GridCellAttr_GetEditor, METH_VARARGS | METH_KEYWORDS },
         { (char *)"GridCellAttr_IsReadOnly", (PyCFunction) _wrap_GridCellAttr_IsReadOnly, METH_VARARGS | METH_KEYWORDS },
+        { (char *)"GridCellAttr_GetKind", (PyCFunction) _wrap_GridCellAttr_GetKind, METH_VARARGS | METH_KEYWORDS },
         { (char *)"GridCellAttr_SetDefAttr", (PyCFunction) _wrap_GridCellAttr_SetDefAttr, METH_VARARGS | METH_KEYWORDS },
         { (char *)"GridCellAttr_swigregister", GridCellAttr_swigregister, METH_VARARGS },
         { (char *)"new_GridCellAttrProvider", (PyCFunction) _wrap_new_GridCellAttrProvider, METH_VARARGS | METH_KEYWORDS },