New methods added

[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 c74f8cacf94ee835a71387e13d29b3a12a99566f..11d4509376509e0d8bed0e40ea72c83c1411eae9 100644 (file)
--- a/wxPython/include/wx/wxPython/pyclasses.h
+++ b/wxPython/include/wx/wxPython/pyclasses.h
@@ -45,7 +45,7 @@ public:
         wxPyValidator* ptr = NULL;
         wxPyValidator* self = (wxPyValidator*)this;
 
         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("()"));
         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);
             }
         }
                 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
 
         // 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:
 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;
 
     DEC_PYCALLBACK__(Notify);
     PYPRIVATE;

+    DECLARE_ABSTRACT_CLASS(wxPyTimer)

 };
 
 
 };
 
 


@@ -123,6 +104,7 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+#ifndef __WXX11__

 class wxPyDropSource : public wxDropSource {
 public:
 #ifndef __WXGTK__
 class wxPyDropSource : public wxDropSource {
 public:
 #ifndef __WXGTK__


@@ -176,7 +158,7 @@ public:
     PYPRIVATE;
 };
 
     PYPRIVATE;
 };
 

-
+#endif

 
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------


@@ -185,6 +167,7 @@ class wxPyVScrolledWindow;
 class wxPyVListBox;
 class wxPyHtmlListBox;
 class wxPyPanel;
 class wxPyVListBox;
 class wxPyHtmlListBox;
 class wxPyPanel;

+class wxPyScrolledWindow;

 class wxPyPopupTransientWindow;
 class wxPyPreviewFrame;
 class wxPyWindow;
 class wxPyPopupTransientWindow;
 class wxPyPreviewFrame;
 class wxPyWindow;


@@ -194,6 +177,7 @@ class wxPyListCtrl;
 class wxPyControl;
 class wxPyPrintout;
 class wxGenericDragImage;
 class wxPyControl;
 class wxPyPrintout;
 class wxGenericDragImage;

+class wxPyTaskBarIcon;

 
 
 #ifdef __WXMAC__
 
 
 #ifdef __WXMAC__