Added autoconf makefiles for FoldBar extended samples

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

diff --git a/wxPython/src/_taskbar.i b/wxPython/src/_taskbar.i
index 88fd35bae9fc6627be682f038d23d5c61a94cabc..1b7540f52c1a99cbdf2a75b72d8175b955a085d9 100644 (file)
--- a/wxPython/src/_taskbar.i
+++ b/wxPython/src/_taskbar.i
@@ -69,7 +69,7 @@ public:
     wxMenu* CreatePopupMenu() {
         wxMenu *rval = NULL;
         bool found;
     wxMenu* CreatePopupMenu() {
         wxMenu *rval = NULL;
         bool found;

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

         if ((found = wxPyCBH_findCallback(m_myInst, "CreatePopupMenu"))) {
             PyObject* ro;
             wxMenu* ptr;
         if ((found = wxPyCBH_findCallback(m_myInst, "CreatePopupMenu"))) {
             PyObject* ro;
             wxMenu* ptr;


@@ -97,7 +97,8 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyTaskBarIcon, wxTaskBarIcon);
 
 MustHaveApp(wxPyTaskBarIcon);
 
 
 MustHaveApp(wxPyTaskBarIcon);
 

-%name(TaskBarIcon)class wxPyTaskBarIcon : public wxEvtHandler
+%rename(TaskBarIcon) wxPyTaskBarIcon;
+class wxPyTaskBarIcon : public wxEvtHandler

 {
 public:
     %pythonAppend wxPyTaskBarIcon   "self._setCallbackInfo(self, TaskBarIcon, 0)"
 {
 public:
     %pythonAppend wxPyTaskBarIcon   "self._setCallbackInfo(self, TaskBarIcon, 0)"