miscellaneous minor corrections (patch 1652327)

[wxWidgets.git] / wxPython / include / wx / wxPython / pyclasses.h

diff --git a/wxPython/include/wx/wxPython/pyclasses.h b/wxPython/include/wx/wxPython/pyclasses.h
index 8ec04a4fdef3f5d337f657da9e444ab19877a76d..eeefbf7527cf2cf346cbee6be108182737bea07b 100644 (file)
--- a/wxPython/include/wx/wxPython/pyclasses.h
+++ b/wxPython/include/wx/wxPython/pyclasses.h
@@ -20,7 +20,7 @@
 //---------------------------------------------------------------------------
 
 class wxPySizer : public wxSizer {
 //---------------------------------------------------------------------------
 
 class wxPySizer : public wxSizer {

-    DECLARE_DYNAMIC_CLASS(wxPySizer);
+    DECLARE_DYNAMIC_CLASS(wxPySizer)

 public:
     wxPySizer() : wxSizer() {};
 
 public:
     wxPySizer() : wxSizer() {};
 


@@ -33,7 +33,7 @@ public:
 //---------------------------------------------------------------------------
 
 class wxPyValidator : public wxValidator {
 //---------------------------------------------------------------------------
 
 class wxPyValidator : public wxValidator {

-    DECLARE_DYNAMIC_CLASS(wxPyValidator);
+    DECLARE_DYNAMIC_CLASS(wxPyValidator)

 public:
     wxPyValidator() {
     }
 public:
     wxPyValidator() {
     }


@@ -45,7 +45,7 @@ public:
         wxPyValidator* ptr = NULL;
         wxPyValidator* self = (wxPyValidator*)this;
 
         wxPyValidator* ptr = NULL;
         wxPyValidator* self = (wxPyValidator*)this;
 

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

         if (wxPyCBH_findCallback(self->m_myInst, "Clone")) {
             PyObject* ro;
             ro = wxPyCBH_callCallbackObj(self->m_myInst, Py_BuildValue("()"));
         if (wxPyCBH_findCallback(self->m_myInst, "Clone")) {
             PyObject* ro;
             ro = wxPyCBH_callCallbackObj(self->m_myInst, Py_BuildValue("()"));


@@ -80,7 +80,8 @@ class wxPyTimer : public wxTimer
 {
 public:
     wxPyTimer(wxEvtHandler *owner=NULL, int id = -1);
 {
 public:
     wxPyTimer(wxEvtHandler *owner=NULL, int id = -1);

-
+    ~wxPyTimer();
+    

     DEC_PYCALLBACK__(Notify);
     PYPRIVATE;
     DECLARE_ABSTRACT_CLASS(wxPyTimer)
     DEC_PYCALLBACK__(Notify);
     PYPRIVATE;
     DECLARE_ABSTRACT_CLASS(wxPyTimer)