X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c039d08bfbb59c0abcbc705fb49f9b2cb321edf..5f4987fed4dc52a35f0ddd649ae1cf9e75bb92d3:/utils/wxPython/src/controls.i?ds=sidebyside diff --git a/utils/wxPython/src/controls.i b/utils/wxPython/src/controls.i index 5b49c393b3..7279b5dc3c 100644 --- a/utils/wxPython/src/controls.i +++ b/utils/wxPython/src/controls.i @@ -15,9 +15,9 @@ %{ #include "helpers.h" #include +#include #ifdef __WXMSW__ -#include #if wxUSE_OWNER_DRAWN #include #endif @@ -36,7 +36,7 @@ %import gdi.i %import events.i -%pragma(python) code = "import wxp" +%pragma(python) code = "import wx" //---------------------------------------------------------------------- @@ -64,7 +64,7 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "button"); - %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)" + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" void SetDefault(); }; @@ -80,7 +80,7 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "button"); - %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)" + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" wxBitmap& GetBitmapLabel(); #ifdef __WXMSW__ @@ -106,7 +106,7 @@ public: const wxValidator& val = wxPyDefaultValidator, char* name = "checkBox"); - %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)" + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" bool GetValue(); void SetValue(const bool state); @@ -124,7 +124,7 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "choice"); - %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)" + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" void Append(const wxString& item); void Clear(); @@ -151,7 +151,7 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "comboBox"); - %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)" + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" void Append(const wxString& item); // TODO: void Append(const wxString& item, char* clientData); @@ -191,7 +191,7 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "gauge"); - %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)" + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" int GetBezelFace(); int GetRange(); @@ -225,7 +225,7 @@ public: long style = 0, char* name = "staticText"); - %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)" + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" wxString GetLabel(); void SetLabel(const wxString& label); @@ -243,7 +243,7 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "listBox"); - %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)" + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" void Append(const wxString& item); // TODO: void Append(const wxString& item, char* clientData); @@ -282,7 +282,7 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "listBox"); - %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)" + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" bool IsChecked(int uiIndex); void Check(int uiIndex, bool bCheck = TRUE); @@ -302,7 +302,7 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "text"); - %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)" + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" void Clear(); void Copy(); @@ -310,18 +310,14 @@ public: void DiscardEdits(); long GetInsertionPoint(); long GetLastPosition(); -#ifdef __WXMSW__ int GetLineLength(long lineNo); wxString GetLineText(long lineNo); int GetNumberOfLines(); -#endif wxString GetValue(); bool IsModified(); bool LoadFile(const wxString& filename); void Paste(); -#ifdef __WXMSW__ void PositionToXY(long pos, long *OUTPUT, long *OUTPUT); -#endif void Remove(long from, long to); void Replace(long from, long to, const wxString& value); bool SaveFile(const wxString& filename); @@ -332,9 +328,7 @@ public: void SetValue(const wxString& value); void ShowPosition(long pos); void WriteText(const wxString& text); -#ifdef __WXMSW__ long XYToPosition(long x, long y); -#endif }; //---------------------------------------------------------------------- @@ -348,13 +342,13 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "scrollBar"); - %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)" + %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); @@ -362,7 +356,6 @@ public: //---------------------------------------------------------------------- -#ifdef __WXMSW__ class wxSpinButton : public wxControl { public: wxSpinButton(wxWindow* parent, wxWindowID id = -1, @@ -377,7 +370,6 @@ public: void SetRange(int min, int max); void SetValue(int value); }; -#endif //---------------------------------------------------------------------- @@ -390,7 +382,7 @@ public: long style = 0, char* name = "staticBitmap"); - %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)" + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" wxBitmap& GetBitmap(); void SetBitmap(const wxBitmap& bitmap); @@ -410,12 +402,14 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "radioBox"); - %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)" + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" %name(EnableBox)void Enable(bool enable); void Enable(int n, bool enable); int FindString(const wxString& string); +#ifdef __WXMSW__ %name(GetBoxLabel)wxString GetLabel(); +#endif wxString GetLabel(int n); int GetSelection(); wxString GetString(int n); @@ -441,7 +435,7 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "radioButton"); - %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)" + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" bool GetValue(); void SetValue(bool value); @@ -459,7 +453,7 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "slider"); - %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)" + %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)" void ClearSel(); void ClearTicks(); @@ -489,7 +483,36 @@ public: ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.8 1998/12/15 20:41:15 RD +// Changed the import semantics from "from wxPython import *" to "from +// wxPython.wx import *" This is for people who are worried about +// namespace pollution, they can use "from wxPython import wx" and then +// prefix all the wxPython identifiers with "wx." +// +// Added wxTaskbarIcon for wxMSW. +// +// Made the events work for wxGrid. +// +// Added wxConfig. +// +// Added wxMiniFrame for wxGTK, (untested.) +// +// Changed many of the args and return values that were pointers to gdi +// objects to references to reflect changes in the wxWindows API. +// +// Other assorted fixes and additions. +// +// Revision 1.7 1998/11/16 00:00:53 RD +// Generic treectrl for wxPython/GTK compiles... +// +// Revision 1.6 1998/11/15 23:03:43 RD +// Removing some ifdef's for wxGTK +// +// Revision 1.5 1998/10/07 07:34:32 RD +// Version 0.4.1 for wxGTK +// // Revision 1.4 1998/10/02 06:40:35 RD +// // Version 0.4 of wxPython for MSW. // // Revision 1.3 1998/08/18 19:48:14 RD