X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7bf854050fd5c04469d4334524433a31d4ba997a..d29aba2ff72e12d2451ae23aa80c5a3e0e039e74:/utils/wxPython/src/controls.i diff --git a/utils/wxPython/src/controls.i b/utils/wxPython/src/controls.i index 925459c540..5504ddf43b 100644 --- a/utils/wxPython/src/controls.i +++ b/utils/wxPython/src/controls.i @@ -1,5 +1,3 @@ -%module controls -%{ ///////////////////////////////////////////////////////////////////////////// // Name: controls.i // Purpose: Control (widget) classes for wxPython @@ -12,10 +10,25 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +%module controls +%{ #include "helpers.h" #include #include +#include +#include + +#ifdef __WXMSW__ +#if wxUSE_OWNER_DRAWN +#include +#endif +#endif + +#ifdef __WXGTK__ +#include +#endif + %} //---------------------------------------------------------------------- @@ -30,18 +43,26 @@ %import gdi.i %import events.i +%pragma(python) code = "import wx" + //---------------------------------------------------------------------- %{ wxValidator wxPyDefaultValidator; // Non-const default because of SWIG %} +%readonly +wxValidator wxDefaultValidator; +%readwrite + //---------------------------------------------------------------------- class wxControl : public wxWindow { public: +#ifdef __WXMSW__ void Command(wxCommandEvent& event); - wxString& GetLabel(); +#endif + wxString GetLabel(); void SetLabel(const wxString& label); }; @@ -55,6 +76,9 @@ public: long style = 0, const wxValidator& validator = wxPyDefaultValidator, char* name = "button"); + + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" + void SetDefault(); }; @@ -69,14 +93,16 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "button"); + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" + + wxBitmap& GetBitmapLabel(); wxBitmap& GetBitmapDisabled(); wxBitmap& GetBitmapFocus(); - wxBitmap& GetBitmapLabel(); wxBitmap& GetBitmapSelected(); void SetBitmapDisabled(const wxBitmap& bitmap); void SetBitmapFocus(const wxBitmap& bitmap); - void SetBitmapLabel(const wxBitmap& bitmap); void SetBitmapSelected(const wxBitmap& bitmap); + void SetBitmapLabel(const wxBitmap& bitmap); }; @@ -91,6 +117,8 @@ public: const wxValidator& val = wxPyDefaultValidator, char* name = "checkBox"); + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" + bool GetValue(); void SetValue(const bool state); }; @@ -107,6 +135,8 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "choice"); + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" + void Append(const wxString& item); void Clear(); int FindString(const wxString& string); @@ -122,7 +152,7 @@ public: //---------------------------------------------------------------------- -class wxComboBox : public wxControl { +class wxComboBox : public wxChoice { public: wxComboBox(wxWindow* parent, wxWindowID id, char* value = "", const wxPoint& pos = wxPyDefaultPosition, @@ -132,6 +162,8 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "comboBox"); + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" + void Append(const wxString& item); // TODO: void Append(const wxString& item, char* clientData); void Clear(); @@ -154,7 +186,7 @@ public: // TODO: void SetClientData(const int n, char* data); void SetInsertionPoint(long pos); void SetInsertionPointEnd(); - void SetSelection(int n, bool select = TRUE); + void SetSelection(int n); %name(SetMark)void SetSelection(long from, long to); void SetValue(const wxString& text); }; @@ -170,6 +202,8 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "gauge"); + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" + int GetBezelFace(); int GetRange(); int GetShadowWidth(); @@ -192,6 +226,19 @@ public: }; +//---------------------------------------------------------------------- + + +class wxStaticLine : public wxControl { +public: + wxStaticLine( wxWindow *parent, wxWindowID id, + const wxPoint &pos = wxPyDefaultPosition, + const wxSize &size = wxPyDefaultSize, + long style = wxLI_HORIZONTAL, + const char* name = "staticLine" ); +}; + + //---------------------------------------------------------------------- class wxStaticText : public wxControl { @@ -202,6 +249,8 @@ public: long style = 0, char* name = "staticText"); + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" + wxString GetLabel(); void SetLabel(const wxString& label); }; @@ -218,6 +267,8 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "listBox"); + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" + void Append(const wxString& item); // TODO: void Append(const wxString& item, char* clientData); void Clear(); @@ -226,7 +277,22 @@ public: int FindString(const wxString& string); // TODO: char* GetClientData(const int n); int GetSelection(); - // TODO: int GetSelections(int **selections); + + // int GetSelections(int **selections); + %addmethods { + PyObject* GetSelections() { + wxArrayInt lst; + self->GetSelections(lst); + PyObject *tup = PyTuple_New(lst.GetCount()); + for(int i=0; iAppendText(text + '\n'); + } + } }; //---------------------------------------------------------------------- @@ -290,11 +397,13 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "scrollBar"); + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" + int GetRange(); int GetPageSize(); - int GetPosition(); + int GetThumbPosition(); int GetThumbSize(); - void SetPosition(int viewStart); + void SetThumbPosition(int viewStart); void SetScrollbar(int position, int thumbSize, int range, int pageSize, bool refresh = TRUE); @@ -328,8 +437,11 @@ public: long style = 0, char* name = "staticBitmap"); - wxBitmap& GetBitmap(); + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" + + const wxBitmap& GetBitmap(); void SetBitmap(const wxBitmap& bitmap); + void SetIcon(const wxIcon& icon); }; //---------------------------------------------------------------------- @@ -346,17 +458,21 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "radioBox"); - %name(EnableBox)void Enable(bool enable); - void Enable(int n, bool enable); + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" + + void Enable(bool enable); + %name(EnableItem)void Enable(int n, bool enable); int FindString(const wxString& string); - %name(GetBoxLabel)wxString GetLabel(); - wxString GetLabel(int n); + +//*** wxString GetLabel(); +//*** void SetLabel(const wxString& label); + + %name(GetItemLabel)wxString GetLabel(int n); int GetSelection(); wxString GetString(int n); wxString GetStringSelection(); int Number(); - %name(SetBoxLabel)void SetLabel(const wxString& label); - void SetLabel(int n, const wxString& label); + %name(SetItemLabel)void SetLabel(int n, const wxString& label); void SetSelection(int n); void SetStringSelection(const wxString& string); void Show(bool show); @@ -375,6 +491,8 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "radioButton"); + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" + bool GetValue(); void SetValue(bool value); }; @@ -391,6 +509,8 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "slider"); + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" + void ClearSel(); void ClearTicks(); int GetLineSize(); @@ -415,12 +535,3 @@ public: //---------------------------------------------------------------------- - -///////////////////////////////////////////////////////////////////////////// -// -// $Log$ -// Revision 1.1 1998/08/09 08:25:49 RD -// Initial version -// -// -