Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

25
wxPython/src/controls.i
View File

@@ -323,7 +323,7 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxValidator& val = wxDefaultValidator,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxPyCheckBoxNameStr);
%name(wxPreCheckBox)wxCheckBox();
@@ -331,7 +331,7 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxValidator& val = wxDefaultValidator,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxPyCheckBoxNameStr);
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
@@ -381,11 +381,11 @@ public:
//----------------------------------------------------------------------
// wxGTK's wxComboBox doesn't derive from wxChoice like wxMSW, or
// even wxControlWithItems, so we have to duplicate the methods
// here... <blech!>
// wxGTK's wxComboBox doesn't derive from wxChoice like wxMSW, or even
// wxControlWithItems, so we have to duplicate the methods here... <blech!>
// wxMac's inheritace is weird too so we'll fake it with this one too.
#ifdef __WXGTK__
#ifndef __WXMSW__
class wxComboBox : public wxControl
{
public:
@@ -477,8 +477,8 @@ public:
#else // For all but wxGTK
#else
// MSW's version derives from wxChoice
class wxComboBox : public wxChoice {
public:
@@ -1131,7 +1131,14 @@ public:
int GetValue();
void SetRange(int min, int max);
void SetValue(int value);
#ifdef __WXGTK__
%addmethods {
void SetSelection(long from, long to) {
}
}
#else
void SetSelection(long from, long to);
#endif
};