Typos

[wxWidgets.git] / wxPython / src / _listctrl.i

diff --git a/wxPython/src/_listctrl.i b/wxPython/src/_listctrl.i
index 3c6eba561c7dec1b3d6c38c467c09cacf1c74306..d95360d13a00d528838cd42f894c10ac5ffa3884 100644 (file)
--- a/wxPython/src/_listctrl.i
+++ b/wxPython/src/_listctrl.i
@@ -18,9 +18,8 @@
 %{
 #include <wx/listctrl.h>
 
 %{
 #include <wx/listctrl.h>
 

-    const wxChar* wxListCtrlNameStr = _T("wxListCtrl");
-    DECLARE_DEF_STRING(ListCtrlNameStr);

 %}
 %}

+MAKE_CONST_WXSTRING2(ListCtrlNameStr, _T("wxListCtrl"));

 
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup


@@ -266,7 +265,7 @@ public:
     long GetIndex();
     int GetColumn();
     wxPoint GetPoint();
     long GetIndex();
     int GetColumn();
     wxPoint GetPoint();

-    %pythoncode { GetPostiion = GetPoint }
+    %pythoncode { GetPosition = GetPoint }

     const wxString& GetLabel();
     const wxString& GetText();
     int GetImage();
     const wxString& GetLabel();
     const wxString& GetText();
     int GetImage();


@@ -342,7 +341,7 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
     static int wxCALLBACK wxPyListCtrl_SortItems(long item1, long item2, long funcPtr) {
         int retval = 0;
         PyObject* func = (PyObject*)funcPtr;
     static int wxCALLBACK wxPyListCtrl_SortItems(long item1, long item2, long funcPtr) {
         int retval = 0;
         PyObject* func = (PyObject*)funcPtr;

-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();

 
         PyObject* args = Py_BuildValue("(ii)", item1, item2);
         PyObject* result = PyEval_CallObject(func, args);
 
         PyObject* args = Py_BuildValue("(ii)", item1, item2);
         PyObject* result = PyEval_CallObject(func, args);


@@ -352,7 +351,7 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
             Py_DECREF(result);
         }
 
             Py_DECREF(result);
         }
 

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

         return retval;
     }
 %}
         return retval;
     }
 %}


@@ -402,8 +401,8 @@ IMP_PYCALLBACK_LISTATTR_LONG(wxPyListCtrl, wxListCtrl, OnGetItemAttr);
 %name(ListCtrl)class wxPyListCtrl : public wxControl {
 public:
 
 %name(ListCtrl)class wxPyListCtrl : public wxControl {
 public:
 

-    %addtofunc wxPyListCtrl         "self._setOORInfo(self);self._setCallbackInfo(self, ListCtrl)"
-    %addtofunc wxPyListCtrl()       ""
+    %pythonAppend wxPyListCtrl         "self._setOORInfo(self);self._setCallbackInfo(self, ListCtrl)"
+    %pythonAppend wxPyListCtrl()       ""

    
     wxPyListCtrl(wxWindow* parent, wxWindowID id = -1,
                  const wxPoint& pos = wxDefaultPosition,
    
     wxPyListCtrl(wxWindow* parent, wxWindowID id = -1,
                  const wxPoint& pos = wxDefaultPosition,


@@ -428,7 +427,7 @@ public:
     bool SetBackgroundColour(const wxColour& col);
 
     // Gets information about this column
     bool SetBackgroundColour(const wxColour& col);
 
     // Gets information about this column

-    %addtofunc GetColumn "if val is not None: val.thisown = 1";  // %newobject doesn't work with OOR typemap
+    %pythonAppend GetColumn "if val is not None: val.thisown = 1";  // %newobject doesn't work with OOR typemap

     %extend {
         wxListItem* GetColumn(int col) {
             wxListItem item;
     %extend {
         wxListItem* GetColumn(int col) {
             wxListItem item;


@@ -471,7 +470,7 @@ public:
 #endif
 
     // Gets information about the item
 #endif
 
     // Gets information about the item

-    %addtofunc GetItem "if val is not None: val.thisown = 1";  // %newobject doesn't work with OOR typemap
+    %pythonAppend GetItem "if val is not None: val.thisown = 1";  // %newobject doesn't work with OOR typemap

     %extend {
         wxListItem* GetItem(long itemId, int col=0) {
             wxListItem* info = new wxListItem;
     %extend {
         wxListItem* GetItem(long itemId, int col=0) {
             wxListItem* info = new wxListItem;


@@ -579,9 +578,13 @@ public:
 
     // is there a way to tell SWIG to disown this???
 
 
     // is there a way to tell SWIG to disown this???
 

-    %addtofunc AssignImageList "args[1].thisown = 0";    
+    %apply SWIGTYPE *DISOWN { wxImageList *imageList };

     void AssignImageList(wxImageList *imageList, int which);
     void AssignImageList(wxImageList *imageList, int which);

-
+    %clear wxImageList *imageList;
+    
+    // are we in report mode?
+    bool InReportView() const;
+        

     // returns True if it is a virtual list control
     bool IsVirtual() const;
 
     // returns True if it is a virtual list control
     bool IsVirtual() const;
 


@@ -776,8 +779,8 @@ public:
 class wxListView : public wxPyListCtrl
 {
 public:
 class wxListView : public wxPyListCtrl
 {
 public:

-    %addtofunc wxListView         "self._setOORInfo(self)"
-    %addtofunc wxListView()       ""
+    %pythonAppend wxListView         "self._setOORInfo(self)"
+    %pythonAppend wxListView()       ""

 
     wxListView( wxWindow *parent,
                 wxWindowID id = -1,
 
     wxListView( wxWindow *parent,
                 wxWindowID id = -1,