cleanup - more reformatting; fixed bug introduced in prior commit

[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 b89991a098572f8e87aae52860972094c5ae25b7..ea8bc0fe34e1aa011e2510b83f64da04794c3d94 100644 (file)
--- a/wxPython/include/wx/wxPython/pyclasses.h
+++ b/wxPython/include/wx/wxPython/pyclasses.h
@@ -20,7 +20,7 @@
 //---------------------------------------------------------------------------
 
 class wxPySizer : public wxSizer {
-    DECLARE_DYNAMIC_CLASS(wxPySizer);
+    DECLARE_DYNAMIC_CLASS(wxPySizer)
 public:
     wxPySizer() : wxSizer() {};
 
@@ -33,7 +33,7 @@ public:
 //---------------------------------------------------------------------------
 
 class wxPyValidator : public wxValidator {
-    DECLARE_DYNAMIC_CLASS(wxPyValidator);
+    DECLARE_DYNAMIC_CLASS(wxPyValidator)
 public:
     wxPyValidator() {
     }
@@ -45,7 +45,7 @@ public:
         wxPyValidator* ptr = NULL;
         wxPyValidator* self = (wxPyValidator*)this;
 
-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
         if (wxPyCBH_findCallback(self->m_myInst, "Clone")) {
             PyObject* ro;
             ro = wxPyCBH_callCallbackObj(self->m_myInst, Py_BuildValue("()"));
@@ -54,7 +54,7 @@ public:
                 Py_DECREF(ro);
             }
         }
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
 
         // This is very dangerous!!! But is the only way I could find
         // to squash a memory leak.  Currently it is okay, but if the
@@ -76,33 +76,14 @@ public:
 //---------------------------------------------------------------------------
 
 
-class wxPyPen : public wxPen {
-public:
-    wxPyPen(wxColour& colour, int width=1, int style=wxSOLID)
-        : wxPen(colour, width, style)
-        { m_dash = NULL; }
-    ~wxPyPen();
-
-    void SetDashes(int nb_dashes, const wxDash *dash);
-
-private:
-    wxDash* m_dash;
-};
-
-
-//---------------------------------------------------------------------------
-
 class wxPyTimer : public wxTimer
 {
 public:
-    wxPyTimer(wxEvtHandler *owner=NULL, int id = -1)
-        : wxTimer(owner, id)
-    {
-        if (owner == NULL) SetOwner(this);
-    }
+    wxPyTimer(wxEvtHandler *owner=NULL, int id = -1);
 
     DEC_PYCALLBACK__(Notify);
     PYPRIVATE;
+    DECLARE_ABSTRACT_CLASS(wxPyTimer)
 };
 
 
@@ -186,6 +167,7 @@ class wxPyVScrolledWindow;
 class wxPyVListBox;
 class wxPyHtmlListBox;
 class wxPyPanel;
+class wxPyScrolledWindow;
 class wxPyPopupTransientWindow;
 class wxPyPreviewFrame;
 class wxPyWindow;
@@ -195,6 +177,7 @@ class wxPyListCtrl;
 class wxPyControl;
 class wxPyPrintout;
 class wxGenericDragImage;
+class wxPyTaskBarIcon;
 
 
 #ifdef __WXMAC__