wxPython Merge #2 of 2.4 branch --> HEAD (branch tag: wxPy_2_4_merge_2)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-07-02 23:13:10 +00:00
parent e234d4c9b7
commit 1fded56b37
535 changed files with 48899 additions and 20067 deletions

View File

@@ -379,6 +379,8 @@ public:
void SetSize(const wxSize& size);
void Show(int show = TRUE);
void Hide();
%pragma(python) addtoclass = "def __nonzero__(self): return self.IsOk()"
};
%inline %{
@@ -537,7 +539,7 @@ public:
bool IsOneShot();
bool IsRunning();
void SetOwner(wxEvtHandler *owner, int id = -1);
void Start(int milliseconds=-1, int oneShot=FALSE);
bool Start(int milliseconds=-1, int oneShot=FALSE);
void Stop();
};
@@ -1048,6 +1050,8 @@ public:
bool SetCapture(wxWindow* win, int pollingFreq = 0);
bool ReleaseCapture();
%pragma(python) addtoclass = "def __nonzero__(self): return self.IsOk()"
};
//----------------------------------------------------------------------
@@ -1081,11 +1085,13 @@ public:
class wxWave : public wxObject
{
public:
wxWave(const wxString& fileName, bool isResource = FALSE);
~wxWave();
wxWave(const wxString& fileName, bool isResource = FALSE);
~wxWave();
bool IsOk() const;
bool Play(bool async = TRUE, bool looped = FALSE) const;
bool IsOk() const;
bool Play(bool async = TRUE, bool looped = FALSE) const;
%pragma(python) addtoclass = "def __nonzero__(self): return self.IsOk()"
};
%new wxWave* wxWaveData(const wxString& data);