reverted my locale change

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

diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i
index 298d60550208a817597d16c0b5d9cd12f8c57e3f..b6aadf03289991140a477d4da6e312049f478581 100644 (file)
--- a/wxPython/src/controls2.i
+++ b/wxPython/src/controls2.i
@@ -694,7 +694,7 @@ public:
     int wxCALLBACK wxPyListCtrl_SortItems(long item1, long item2, long funcPtr) {
         int retval = 0;
         PyObject* func = (PyObject*)funcPtr;
-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();
 
         PyObject* args = Py_BuildValue("(ii)", item1, item2);
         PyObject* result = PyEval_CallObject(func, args);
@@ -704,7 +704,7 @@ public:
             Py_DECREF(result);
         }
 
-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();
         return retval;
     }
 
@@ -765,10 +765,12 @@ enum {
     wxTR_TWIST_BUTTONS,
     wxTR_NO_LINES,
     wxTR_MAC_BUTTONS,
+    wxTR_AQUA_BUTTONS,
 
     wxTR_SINGLE,
     wxTR_MULTIPLE,
     wxTR_EXTENDED,
+    wxTR_FULL_ROW_HIGHLIGHT,
 
     wxTR_EDIT_LABELS,
     wxTR_LINES_AT_ROOT,
@@ -919,6 +921,7 @@ public:
     wxTreeItemId();
     ~wxTreeItemId();
     bool IsOk();
+    %pragma(python) addtoclass = "Ok = IsOk"
 
     %addmethods {
         int __cmp__(wxTreeItemId* other) {
@@ -941,9 +944,9 @@ public:
     }
 
     ~wxPyTreeItemData() {
-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();
         Py_DECREF(m_obj);
-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();
     }
 
     PyObject* GetData() {
@@ -952,9 +955,9 @@ public:
     }
 
     void SetData(PyObject* obj) {
-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();
         Py_DECREF(m_obj);
-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();
         m_obj = obj;
         Py_INCREF(obj);
     }
@@ -1019,13 +1022,13 @@ public:
                        const wxTreeItemId& item2) {
         int rval = 0;
         bool found;
-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();
         if ((found = m_myInst.findCallback("OnCompareItems")))
             rval = m_myInst.callCallback(Py_BuildValue(
                 "(OO)",
                 wxPyConstructObject((void*)&item1, "wxTreeItemId"),
                 wxPyConstructObject((void*)&item2, "wxTreeItemId")));
-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();
         if (! found)
             rval = wxTreeCtrl::OnCompareItems(item1, item2);
         return rval;
@@ -1144,7 +1147,7 @@ public:
     //size_t GetSelections(wxArrayTreeItemIds& selection);
     %addmethods {
         PyObject* GetSelections() {
-            wxPyTState* state = wxPyBeginBlockThreads();
+            wxPyBeginBlockThreads();
             PyObject*           rval = PyList_New(0);
             wxArrayTreeItemIds  array;
             size_t              num, x;
@@ -1154,7 +1157,7 @@ public:
                 PyObject* item = wxPyConstructObject((void*)tii, "wxTreeItemId", TRUE);
                 PyList_Append(rval, item);
             }
-            wxPyEndBlockThreads(state);
+            wxPyEndBlockThreads();
             return rval;
         }
     }
@@ -1233,16 +1236,17 @@ public:
 
 #ifdef __WXMSW__
     void SetItemDropHighlight(const wxTreeItemId& item, int highlight = TRUE);
+#endif
 
     //bool GetBoundingRect(const wxTreeItemId& item, wxRect& rect, int textOnly = FALSE)
     %addmethods {
         PyObject* GetBoundingRect(const wxTreeItemId& item, int textOnly = FALSE) {
             wxRect rect;
             if (self->GetBoundingRect(item, rect, textOnly)) {
-                wxPyTState* state = wxPyBeginBlockThreads();
+                wxPyBeginBlockThreads();
                 wxRect* r = new wxRect(rect);
                 PyObject* val = wxPyConstructObject((void*)r, "wxRect");
-                wxPyEndBlockThreads(state);
+                wxPyEndBlockThreads();
                 return val;
             }
             else {
@@ -1251,7 +1255,7 @@ public:
             }
         }
     }
-#endif
+
 
 %pragma(python) addtoclass = "
     # Redefine some methods that SWIG gets a bit confused on...
@@ -1271,6 +1275,7 @@ public:
         val1.thisown = 1
         return (val1,val2)
 "
+
 };