reverted my locale change

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

diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i
index f164ac73482345af9f33f4ae4af2f458e67bef4a..133605331c376bc91b73eadc052eece4217b2cad 100644 (file)
--- a/wxPython/src/windows.i
+++ b/wxPython/src/windows.i
@@ -123,7 +123,7 @@ public:
         wxPyValidator* ptr = NULL;
         wxPyValidator* self = (wxPyValidator*)this;
 
         wxPyValidator* ptr = NULL;
         wxPyValidator* self = (wxPyValidator*)this;
 

-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();

         if (self->m_myInst.findCallback("Clone")) {
             PyObject* ro;
             ro = self->m_myInst.callCallbackObj(Py_BuildValue("()"));
         if (self->m_myInst.findCallback("Clone")) {
             PyObject* ro;
             ro = self->m_myInst.callCallbackObj(Py_BuildValue("()"));


@@ -132,7 +132,7 @@ public:
                 Py_DECREF(ro);
             }
         }
                 Py_DECREF(ro);
             }
         }

-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();

 
         // This is very dangerous!!! But is the only way I could find
         // to squash a memory leak.  Currently it is okay, but if the
 
         // This is very dangerous!!! But is the only way I could find
         // to squash a memory leak.  Currently it is okay, but if the


@@ -402,9 +402,12 @@ public:
     wxAcceleratorTable *GetAcceleratorTable();
 
 #ifdef __WXMSW__
     wxAcceleratorTable *GetAcceleratorTable();
 
 #ifdef __WXMSW__

-    // This seems pretty bogus, but is currently needed for SplitTree
+    // A way to do the native draw first...  Too bad it isn't in wxGTK too.

     void OnPaint(wxPaintEvent& event);
 #endif
     void OnPaint(wxPaintEvent& event);
 #endif

+
+    wxButton* GetDefaultItem();
+    void SetDefaultItem(wxButton *btn);

 };
 
 
 };
 
 


@@ -460,8 +463,6 @@ public:
     %pragma(python) addtomethod = "wxPrePanel:val._setOORInfo(val)"
 
     void InitDialog();
     %pragma(python) addtomethod = "wxPrePanel:val._setOORInfo(val)"
 
     void InitDialog();

-    wxButton* GetDefaultItem();
-    void SetDefaultItem(wxButton *btn);

 
 };
 
 
 };