← Back to branch summary

~ubuntu-branches/ubuntu/raring/wxwidgets2.8/raring

« back to all changes in this revision

Viewing changes to wxPython/src/_cmndlgs.i

  • Committer: Package Import Robot
  • Author(s): Stéphane Graber
  • Date: 2012-01-07 13:59:25 UTC
  • mfrom: (1.1.9) (5.1.10 sid)
  • Revision ID: package-import@ubuntu.com-20120107135925-2601miy9ullcon9j
Tags: 2.8.12.1-6ubuntu1
https://launchpad.net/bugs/632984
* Resync from Debian, changes that were kept:
  - debian/rules: re-enable mediactrl. This allows libwx_gtk2u_media-2.8 to be
    built, as this is required by some applications (LP: #632984)
  - debian/control: Build-dep on libxt-dev for mediactrl.
  - Patches
    + fix-bashism-in-example
* Add conflict on python-wxgtk2.8 (<< 2.8.12.1-6ubuntu1~) to python-wxversion
  to guarantee upgrade ordering when moving from pycentral to dh_python2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
wxPython/src/_cmndlgs.i
5
5
// Author:      Robin Dunn
6
6
//
7
7
// Created:     25-July-1998
8
 
// RCS-ID:      $Id: _cmndlgs.i 57740 2009-01-02 04:28:25Z RD $
 
8
// RCS-ID:      $Id: _cmndlgs.i 65975 2010-11-02 00:41:01Z RD $
9
9
// Copyright:   (c) 2003 by Total Control Software
10
10
// Licence:     wxWindows license
11
11
/////////////////////////////////////////////////////////////////////////////
836
836
", "");
837
837
 
838
838
 
839
 
    DocDeclAStr(
840
 
        virtual bool , Pulse(const wxString& newmsg = wxPyEmptyString,
841
 
                                   bool *OUTPUT),
842
 
        "Pulse(self, String newmsg) --> (continue, skip)",
843
 
        "Just like `Update` but switches the dialog to use a gauge in
844
 
interminante mode and calls `wx.Gauge.Pulse` to show the user a bit of
845
 
progress.", "");
 
839
    %extend {
 
840
        DocDeclAStr(
 
841
            PyObject* , Pulse(const wxString& newmsg = wxPyEmptyString),
 
842
            "Pulse(self, String newmsg) --> (continue, skip)",
 
843
            "Just like `Update` but switches the dialog to use a gauge in
 
844
indeterminate mode and calls `wx.Gauge.Pulse` to show the user a bit of
 
845
progress.", "")
 
846
        {            
 
847
            wxPyBlock_t blocked = wxPyBeginBlockThreads();
 
848
            PyObject* rval;
 
849
            bool r;
 
850
            bool skip=false;
 
851
            r = self->Pulse(newmsg, &skip);
 
852
            rval = PyTuple_New(2);
 
853
            PyTuple_SET_ITEM(rval, 0, PyBool_FromLong((int)r));
 
854
            PyTuple_SET_ITEM(rval, 1, PyBool_FromLong((int)skip));
 
855
            wxPyEndBlockThreads(blocked);
 
856
            return rval;
 
857
        }
 
858
    }
846
859
    %pythoncode { UpdatePulse =  Pulse }
847
860
 
848
861
    DocDeclStr(