Menu
▾
▴
[Wxlua-commit] wxLua/bindings/wxwidgets clipdrag.i,1.17,1.18 config.i,1.11,1.12 controls.i,1.18,1.19 data.i,1.14,1.15 datetime.i,1.15,1.16 event.i,1.13,1.14 file.i,1.11,1.12 gdi.i,1.23,1.24 override.hpp,1.40,1.41 wx_datatypes.lua,1.30,1.31
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8015/wxLua/bindings/wxwidgets Modified Files: clipdrag.i config.i controls.i data.i datetime.i event.i file.i gdi.i override.hpp wx_datatypes.lua Log Message: add binding tag for LuaFunction add %overload up to file.i, note static funcs don't work now add SortItems function for wxListCtrl, untested tabs -> spaces Index: config.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/config.i,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** config.i 17 May 2006 05:02:04 -0000 1.11 --- config.i 18 May 2006 05:47:39 -0000 1.12 *************** *** 58,68 **** wxConfigBase::EntryType GetEntryType(const wxString& name) const // %override [bool, string, index] wxConfigBase::GetFirstGroup() ! bool GetFirstGroup(wxString& str, long& index) const // %override [bool, string, index] wxConfigBase::GetFirstEntry() ! bool GetFirstEntry(wxString& str, long& index) const // %override [bool, string, index] wxConfigBase::GetNextGroup(index) ! bool GetNextGroup(wxString& str, long& index) const // %override [bool, string, index] wxConfigBase::GetNextEntry(index) ! bool GetNextEntry(wxString& str, long& index) const unsigned int GetNumberOfEntries(bool bRecursive = false) const unsigned int GetNumberOfGroups(bool bRecursive = false) const --- 58,74 ---- wxConfigBase::EntryType GetEntryType(const wxString& name) const // %override [bool, string, index] wxConfigBase::GetFirstGroup() ! //bool GetFirstGroup(wxString& str, long& index) const ! bool GetFirstGroup() const ! // %override [bool, string, index] wxConfigBase::GetFirstEntry() ! //bool GetFirstEntry(wxString& str, long& index) const ! bool GetFirstEntry() const // %override [bool, string, index] wxConfigBase::GetNextGroup(index) ! //bool GetNextGroup(wxString& str, long& index) const ! bool GetNextGroup() const // %override [bool, string, index] wxConfigBase::GetNextEntry(index) ! //bool GetNextEntry(wxString& str, long& index) const ! bool GetNextEntry(long index) const ! unsigned int GetNumberOfEntries(bool bRecursive = false) const unsigned int GetNumberOfGroups(bool bRecursive = false) const *************** *** 74,94 **** bool IsRecordingDefaults() const ! // Note: wxConfigBase_Read naming convention is same as wxPython, int is long, float is double // %override [string, bool] wxConfigBase::Read(const wxString& key, const wxString& defaultVal = "") ! bool Read(const wxString& key, wxString* str, const wxString& defaultVal = "") const // %override [int, bool] wxConfigBase::ReadInt(const wxString& key, long defaultVal = 0) ! %rename ReadInt bool Read(const wxString& key, long* l, long defaultVal = 0) const // %override [double, bool] wxConfigBase::ReadFloat(const wxString& key, double defaultVal = 0) ! %rename ReadFloat bool Read(const wxString& key, double* d, double defaultVal = 0) const bool RenameEntry(const wxString& oldName, const wxString& newName) bool RenameGroup(const wxString& oldName, const wxString& newName) ! static wxConfigBase* Set(wxConfigBase *pConfig = NULL) ! void SetExpandEnvVars(bool bDoIt = true) void SetPath(const wxString& strPath) void SetRecordDefaults(bool bDoIt = true) ! // Note: wxConfigBase_Write naming convention is same as wxPython, int is long, float is double bool Write(const wxString& key, wxString &value) %rename WriteInt bool Write(const wxString &key, long value) --- 80,102 ---- bool IsRecordingDefaults() const ! // Note: wxConfigBase::Read naming convention is same as wxPython, int is long, float is double // %override [string, bool] wxConfigBase::Read(const wxString& key, const wxString& defaultVal = "") ! //bool Read(const wxString& key, wxString* str, const wxString& defaultVal = "") const ! bool Read(const wxString& key, const wxString& defaultVal = "") const // %override [int, bool] wxConfigBase::ReadInt(const wxString& key, long defaultVal = 0) ! //%rename ReadInt bool Read(const wxString& key, long* l, long defaultVal = 0) const ! %rename ReadInt bool Read(const wxString& key, long defaultVal = 0) const // %override [double, bool] wxConfigBase::ReadFloat(const wxString& key, double defaultVal = 0) ! //%rename ReadFloat bool Read(const wxString& key, double* d, double defaultVal = 0) const ! %rename ReadFloat bool Read(const wxString& key, double defaultVal = 0) const bool RenameEntry(const wxString& oldName, const wxString& newName) bool RenameGroup(const wxString& oldName, const wxString& newName) ! %static wxConfigBase* Set(wxConfigBase *pConfig = NULL) void SetExpandEnvVars(bool bDoIt = true) void SetPath(const wxString& strPath) void SetRecordDefaults(bool bDoIt = true) ! // Note: wxConfigBase::Write naming convention is same as wxPython, int is long, float is double bool Write(const wxString& key, wxString &value) %rename WriteInt bool Write(const wxString &key, long value) *************** *** 105,108 **** --- 113,117 ---- %class %noclassinfo wxConfig, wxConfigBase wxConfig(const wxString& appName = "", const wxString& vendorName = "", const wxString& localFilename = "", const wxString& globalFilename = "", long style = 0) + %endclass *************** *** 112,115 **** --- 121,125 ---- %class %noclassinfo wxFileConfig, wxConfigBase wxFileConfig(const wxString& appName = "", const wxString& vendorName = "", const wxString& localFilename = "", const wxString& globalFilename = "", long style = wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE) //, wxMBConv& conv = wxConvUTF8) + void SetUmask(int mode) %endclass Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** wx_datatypes.lua 17 May 2006 22:47:09 -0000 1.30 --- wx_datatypes.lua 18 May 2006 05:47:39 -0000 1.31 *************** *** 63,66 **** --- 63,71 ---- Name = "LPVOID", }, + LuaFunction = { + DefType = "wxtypedef", + Intrinsic = true, + Name = "LuaFunction", + }, LuaTable = { DefType = "wxtypedef", Index: file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** file.i 17 May 2006 05:02:04 -0000 1.11 --- file.i 18 May 2006 05:47:39 -0000 1.12 *************** *** 96,104 **** void AppendDir(const wxString& dir) ! void Assign(const wxFileName& filepath) ! %rename AssignFullName void Assign(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! %rename AssignVolume void Assign(const wxString& volume, const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) ! %rename AssignPath void Assign(const wxString& path, const wxString& name, wxPathFormat format = wxPATH_NATIVE) ! %rename AssignPathNameExt void Assign(const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) void AssignCwd(const wxString& volume = "") void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE) --- 96,104 ---- void AppendDir(const wxString& dir) ! %overload void Assign(const wxFileName& filepath) ! %overload %rename AssignFullName void Assign(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! %overload %rename AssignVolume void Assign(const wxString& volume, const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) ! %overload %rename AssignPath void Assign(const wxString& path, const wxString& name, wxPathFormat format = wxPATH_NATIVE) ! %overload %rename AssignPathNameExt void Assign(const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) void AssignCwd(const wxString& volume = "") void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE) *************** *** 167,175 **** void SetVolume(const wxString& volume) // %override [wxString path, wxString name, wxString ext] wxFileName::SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! static void SplitPath(const wxString& fullpath, wxString* path, wxString* name, wxString* ext, wxPathFormat format = wxPATH_NATIVE) // %override [wxString volume, wxString path, wxString name, wxString ext] wxFileName::SplitPathVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! %rename SplitPathVolume static void SplitPath(const wxString& fullpath, wxString* volume, wxString* path, wxString* name, wxString* ext, wxPathFormat format = wxPATH_NATIVE) // %override [wxString volume, wxString path] wxFileName::SplitVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! static void SplitVolume(const wxString& fullpath, wxString* volume, wxString* path, wxPathFormat format = wxPATH_NATIVE) bool Touch() --- 167,178 ---- void SetVolume(const wxString& volume) // %override [wxString path, wxString name, wxString ext] wxFileName::SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! //static void SplitPath(const wxString& fullpath, wxString* path, wxString* name, wxString* ext, wxPathFormat format = wxPATH_NATIVE) ! static void SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) // %override [wxString volume, wxString path, wxString name, wxString ext] wxFileName::SplitPathVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! //%rename SplitPathVolume static void SplitPath(const wxString& fullpath, wxString* volume, wxString* path, wxString* name, wxString* ext, wxPathFormat format = wxPATH_NATIVE) ! %rename SplitPathVolume static void SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) // %override [wxString volume, wxString path] wxFileName::SplitVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! //static void SplitVolume(const wxString& fullpath, wxString* volume, wxString* path, wxPathFormat format = wxPATH_NATIVE) ! static void SplitVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) bool Touch() *************** *** 188,196 **** %enum wxFile::OpenMode // FIXME! ! %rename wxFileRead read ! %rename wxFileWrite write ! %rename wxFileReadWrite read_write ! %rename wxFileWriteAppend write_append ! %rename wxFileWriteExcl write_excl %endenum --- 191,199 ---- %enum wxFile::OpenMode // FIXME! ! read ! write ! read_write ! write_append ! write_excl %endenum *************** *** 203,210 **** %enum wxFileKind ! wxFILE_KIND_UNKNOWN ! wxFILE_KIND_DISK ! wxFILE_KIND_TERMINAL ! wxFILE_KIND_PIPE %endenum --- 206,213 ---- %enum wxFileKind ! wxFILE_KIND_UNKNOWN ! wxFILE_KIND_DISK ! wxFILE_KIND_TERMINAL ! wxFILE_KIND_PIPE %endenum *************** *** 243,247 **** wxFileOffset Tell() const // %override size_t wxFile::Write(lua string, unsigned int count) ! size_t Write(const void* buffer, unsigned int count) %rename WriteString size_t Write(const wxString &str) %endclass --- 246,251 ---- wxFileOffset Tell() const // %override size_t wxFile::Write(lua string, unsigned int count) ! //size_t Write(const void* buffer, unsigned int count) ! size_t Write(const wxString& buffer, unsigned int count) %rename WriteString size_t Write(const wxString &str) %endclass *************** *** 330,339 **** char Peek() // %override [lua string] wxInputStream::Read(size_t size) ! wxInputStream& Read(void *buffer, size_t size) %rename ReadStream wxInputStream& Read(wxOutputStream& stream_in) wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart) wxFileOffset TellI() const // %override size_t wxInputStream::Unget(lua string, size_t size) ! %rename Unget size_t Ungetch(const char* buffer, size_t size) bool Ungetch(char c) %endclass --- 334,345 ---- char Peek() // %override [lua string] wxInputStream::Read(size_t size) ! //wxInputStream& Read(void *buffer, size_t size) ! wxInputStream& Read(size_t size) %rename ReadStream wxInputStream& Read(wxOutputStream& stream_in) wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart) wxFileOffset TellI() const // %override size_t wxInputStream::Unget(lua string, size_t size) ! //%rename Unget size_t Ungetch(const char* buffer, size_t size) ! %rename Unget size_t Ungetch(const wxString& str, size_t size) bool Ungetch(char c) %endclass *************** *** 351,355 **** wxFileOffset TellO() const // %override wxOutputStream& wxOutputStream::Write(lua string, size_t size) ! wxOutputStream& Write(const void *buffer, size_t size) %rename WriteStream wxOutputStream& Write(wxInputStream& stream_in) %endclass --- 357,362 ---- wxFileOffset TellO() const // %override wxOutputStream& wxOutputStream::Write(lua string, size_t size) ! //wxOutputStream& Write(const void *buffer, size_t size) ! wxOutputStream& Write(const wxString& buffer, size_t size) %rename WriteStream wxOutputStream& Write(wxInputStream& stream_in) %endclass Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** gdi.i 17 May 2006 05:02:04 -0000 1.23 --- gdi.i 18 May 2006 05:47:39 -0000 1.24 *************** *** 36,43 **** %overload %operator wxPoint& operator+=(const wxPoint& p) %overload %operator wxPoint& operator-=(const wxPoint& p) ! %overload %operator wxPoint& operator+=(const wxSize& s) ! %overload %operator wxPoint& operator-=(const wxSize& s) ! %overload %operator wxPoint operator+(const wxSize& s) const ! %overload %operator wxPoint operator-(const wxSize& s) const %endclass --- 36,43 ---- %overload %operator wxPoint& operator+=(const wxPoint& p) %overload %operator wxPoint& operator-=(const wxPoint& p) ! %overload %rename op_add_assign_Size %operator wxPoint& operator+=(const wxSize& s) ! %overload %rename op_sub_assign_Size %operator wxPoint& operator-=(const wxSize& s) ! %overload %rename op_add_Size %operator wxPoint operator+(const wxSize& s) const ! %overload %rename op_sub_Size %operator wxPoint operator-(const wxSize& s) const %endclass *************** *** 150,178 **** void Clear() ! wxRegionContain Contains(long x, long y) ! %rename ContainsPoint wxRegionContain Contains(const wxPoint& pt) ! %rename ContainsRect wxRegionContain Contains(const wxRect& rect) ! %rename ContainsRectDim wxRegionContain Contains(long x, long y, long w, long h) wxBitmap ConvertToBitmap() const wxRect GetBox() const // %override [int x, int y, int width, int height] wxRegion::GetBoxCoords() ! %rename GetBoxCoords void GetBox(int &x, int &y, int &width, int &height) ! bool Intersect(long x, long y, long width, long height) ! %rename IntersectRect bool Intersect(const wxRect& rect) ! %rename IntersectRegion bool Intersect(const wxRegion& region) bool IsEmpty() const //%gtk bool Ok() const ! bool Subtract(long x, long y, long width, long height) ! %rename SubtractRect bool Subtract(const wxRect& rect) ! %rename SubtractRegion bool Subtract(const wxRegion& region) bool Offset(wxCoord x, wxCoord y) ! bool Union(long x, long y, long width, long height) ! %rename UnionRect bool Union(const wxRect& rect) ! %rename UnionRegion bool Union(const wxRegion& region) ! %rename UnionBitmap bool Union(const wxBitmap& bmp) ! %rename UnionBitmapTransparent bool Union(const wxBitmap& bmp, const wxColour& transColour, int tolerance = 0) ! bool Xor(long x, long y, long width, long height) ! %rename XorRect bool Xor(const wxRect& rect) ! %rename XorRegion bool Xor(const wxRegion& region) %property=Box, read --- 150,179 ---- void Clear() ! %overload wxRegionContain Contains(long x, long y) ! %overload %rename ContainsPoint wxRegionContain Contains(const wxPoint& pt) ! %overload %rename ContainsRect wxRegionContain Contains(const wxRect& rect) ! %overload %rename ContainsRectDim wxRegionContain Contains(long x, long y, long w, long h) wxBitmap ConvertToBitmap() const wxRect GetBox() const // %override [int x, int y, int width, int height] wxRegion::GetBoxCoords() ! //%rename GetBoxCoords void GetBox(int &x, int &y, int &width, int &height) ! %rename GetBoxCoords void GetBox() ! %overload bool Intersect(long x, long y, long width, long height) ! %overload %rename IntersectRect bool Intersect(const wxRect& rect) ! %overload %rename IntersectRegion bool Intersect(const wxRegion& region) bool IsEmpty() const //%gtk bool Ok() const ! %overload bool Subtract(long x, long y, long width, long height) ! %overload %rename SubtractRect bool Subtract(const wxRect& rect) ! %overload %rename SubtractRegion bool Subtract(const wxRegion& region) bool Offset(wxCoord x, wxCoord y) ! %overload bool Union(long x, long y, long width, long height) ! %overload %rename UnionRect bool Union(const wxRect& rect) ! %overload %rename UnionRegion bool Union(const wxRegion& region) ! %overload %rename UnionBitmap bool Union(const wxBitmap& bmp) ! %overload %rename UnionBitmapTransparent bool Union(const wxBitmap& bmp, const wxColour& transColour, int tolerance = 0) ! %overload bool Xor(long x, long y, long width, long height) ! %overload %rename XorRect bool Xor(const wxRect& rect) ! %overload %rename XorRegion bool Xor(const wxRegion& region) %property=Box, read *************** *** 320,324 **** %define %object wxNullFont ! %rename wxNORMAL_FONT %define %pointer wxLua_wxNORMAL_FONT %rename wxSMALL_FONT %define %pointer wxLua_wxSMALL_FONT %rename wxITALIC_FONT %define %pointer wxLua_wxITALIC_FONT --- 321,325 ---- %define %object wxNullFont ! %rename wxNORMAL_FONT %define %pointer wxLua_wxNORMAL_FONT // hack for wxWidgets >2.7 %rename wxSMALL_FONT %define %pointer wxLua_wxSMALL_FONT %rename wxITALIC_FONT %define %pointer wxLua_wxITALIC_FONT *************** *** 372,375 **** --- 373,377 ---- %class %delete %noclassinfo %encapsulate wxFontEnumerator wxFontEnumerator() + virtual bool EnumerateFacenames( wxFontEncoding encoding = wxFONTENCODING_SYSTEM, bool fixedWidthOnly = false) virtual bool EnumerateEncodings( const wxString &font = "" ) *************** *** 448,452 **** wxColour(const unsigned char red, const unsigned char green, const unsigned char blue) ! %constructor wxNamedColour(const wxString& colourNname) // python compatibility %constructor wxColourCopy(const wxColour& colour) --- 450,454 ---- wxColour(const unsigned char red, const unsigned char green, const unsigned char blue) ! %constructor wxNamedColour(const wxString& colourName) // wxPython compatibility %constructor wxColourCopy(const wxColour& colour) *************** *** 582,588 **** bool IsHatch() const bool Ok() const ! void SetColour(wxColour& colour) ! %rename SetColourString void SetColour(const wxString& colourName) ! %rename SetColourRGB void SetColour(const unsigned char red, const unsigned char green, const unsigned char blue) void SetStipple(const wxBitmap& bitmap) void SetStyle(int style) --- 584,590 ---- bool IsHatch() const bool Ok() const ! %overload void SetColour(wxColour& colour) ! %overload %rename SetColourString void SetColour(const wxString& colourName) ! %overload %rename SetColourRGB void SetColour(const unsigned char red, const unsigned char green, const unsigned char blue) void SetStipple(const wxBitmap& bitmap) void SetStyle(int style) *************** *** 774,778 **** %class %delete wxCursor, wxBitmap // just wxObject in GTK %define %object wxNullCursor ! %rename wxSTANDARD_CURSOR %define %pointer wxLua_wxSTANDARD_CURSOR %rename wxHOURGLASS_CURSOR %define %pointer wxLua_wxHOURGLASS_CURSOR %rename wxCROSS_CURSOR %define %pointer wxLua_wxCROSS_CURSOR --- 776,780 ---- %class %delete wxCursor, wxBitmap // just wxObject in GTK %define %object wxNullCursor ! %rename wxSTANDARD_CURSOR %define %pointer wxLua_wxSTANDARD_CURSOR // hack for wxWidgets >2.7 %rename wxHOURGLASS_CURSOR %define %pointer wxLua_wxHOURGLASS_CURSOR %rename wxCROSS_CURSOR %define %pointer wxLua_wxCROSS_CURSOR *************** *** 813,819 **** %win %constructor wxMaskIndex(const wxBitmap& bitmap, int index) ! bool Create(const wxBitmap& bitmap) ! %rename CreateColour bool Create(const wxBitmap& bitmap, const wxColour& colour) ! %win %rename CreateIndex bool Create(const wxBitmap& bitmap, int index) %endclass --- 815,821 ---- %win %constructor wxMaskIndex(const wxBitmap& bitmap, int index) ! %overload bool Create(const wxBitmap& bitmap) ! %overload %rename CreateColour bool Create(const wxBitmap& bitmap, const wxColour& colour) ! %overload %win %rename CreateIndex bool Create(const wxBitmap& bitmap, int index) %endclass *************** *** 838,844 **** wxImageList(int width, int height, bool mask = true, int initialCount = 1) ! int Add(const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap) ! %rename AddWithColourMask int Add(const wxBitmap& bitmap, const wxColour& maskColour) ! %rename AddIcon int Add(const wxIcon& icon) bool Draw(int index, wxDC& dc, int x, int y, int flags = wxIMAGELIST_DRAW_NORMAL, bool solidBackground = false) wxBitmap GetBitmap(int index) const --- 840,846 ---- wxImageList(int width, int height, bool mask = true, int initialCount = 1) ! %overload int Add(const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap) ! %overload %rename AddWithColourMask int Add(const wxBitmap& bitmap, const wxColour& maskColour) ! %overload %rename AddIcon int Add(const wxIcon& icon) bool Draw(int index, wxDC& dc, int x, int y, int flags = wxIMAGELIST_DRAW_NORMAL, bool solidBackground = false) wxBitmap GetBitmap(int index) const *************** *** 846,850 **** int GetImageCount() // %override [int width, int height] wxImageList::GetSize(int index) ! void GetSize(int index, int& width, int& height) bool Remove(int index) bool RemoveAll() --- 848,853 ---- int GetImageCount() // %override [int width, int height] wxImageList::GetSize(int index) ! //void GetSize(int index, int& width, int& height) ! void GetSize(int index) bool Remove(int index) bool RemoveAll() *************** *** 951,956 **** void DrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) void DrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool transparent) ! void DrawCheckMark(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ! %rename DrawCheckMarkRect void DrawCheckMark(const wxRect &rect) void DrawCircle(wxCoord x, wxCoord y, wxCoord radius) //void DrawCircle(const wxPoint& pt, wxCoord radius) --- 954,959 ---- void DrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) void DrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool transparent) ! %overload void DrawCheckMark(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ! %overload %rename DrawCheckMarkRect void DrawCheckMark(const wxRect &rect) void DrawCircle(wxCoord x, wxCoord y, wxCoord radius) //void DrawCircle(const wxPoint& pt, wxCoord radius) *************** *** 960,969 **** void DrawEllipticArc(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double start, double end) void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) ! %rename DrawLabelBitmap void DrawLabel(const wxString& text, const wxBitmap& image, const wxRect& rect, int alignment = wxALIGN_LEFT | wxALIGN_TOP, int indexAccel = -1) //, wxRect *rectBounding = NULL) ! void DrawLabel(const wxString& text, const wxRect& rect, int alignment = wxALIGN_LEFT | wxALIGN_TOP, int indexAccel = -1) void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) ! //void DrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) %rename DrawLinesList void DrawLines(wxList *points, wxCoord xoffset = 0, wxCoord yoffset = 0) ! //void DrawPolygon(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, int fill_style = wxODDEVEN_RULE) %rename DrawPolygonList void DrawPolygon(wxList *points, wxCoord xoffset = 0, wxCoord yoffset = 0, int fill_style = wxODDEVEN_RULE) //void DrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, int fill_style = wxODDEVEN_RULE) --- 963,972 ---- void DrawEllipticArc(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double start, double end) void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) ! %overload %rename DrawLabelBitmap void DrawLabel(const wxString& text, const wxBitmap& image, const wxRect& rect, int alignment = wxALIGN_LEFT | wxALIGN_TOP, int indexAccel = -1) //, wxRect *rectBounding = NULL) ! %overload void DrawLabel(const wxString& text, const wxRect& rect, int alignment = wxALIGN_LEFT | wxALIGN_TOP, int indexAccel = -1) void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) ! //void DrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) // FIXME add this %rename DrawLinesList void DrawLines(wxList *points, wxCoord xoffset = 0, wxCoord yoffset = 0) ! //void DrawPolygon(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, int fill_style = wxODDEVEN_RULE) // FIXME add this %rename DrawPolygonList void DrawPolygon(wxList *points, wxCoord xoffset = 0, wxCoord yoffset = 0, int fill_style = wxODDEVEN_RULE) //void DrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, int fill_style = wxODDEVEN_RULE) *************** *** 1013,1020 **** void SetBackgroundMode(int mode) void SetBrush(const wxBrush& brush) ! %rename SetClippingRegionXY void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ! void SetClippingRegion(const wxRegion& region) ! //void SetClippingRegion(const wxPoint& pt, const wxSize& sz) ! //void SetClippingRegion(const wxRect& rect) void SetDeviceOrigin(wxCoord x, wxCoord y) void SetFont(const wxFont& font) --- 1016,1023 ---- void SetBackgroundMode(int mode) void SetBrush(const wxBrush& brush) ! %overload %rename SetClippingRegionXYWH void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ! %overload void SetClippingRegion(const wxRegion& region) ! //%overload void SetClippingRegion(const wxPoint& pt, const wxSize& sz) ! //%overload void SetClippingRegion(const wxRect& rect) void SetDeviceOrigin(wxCoord x, wxCoord y) void SetFont(const wxFont& font) *************** *** 1083,1086 **** --- 1086,1090 ---- %class %delete wxScreenDC, wxDC wxScreenDC() + static bool StartDrawingOnTop(wxWindow* window) %rename StartDrawingOnTopRect static bool StartDrawingOnTop(wxRect* rect = NULL) *************** *** 1094,1103 **** %class %delete wxBufferedDC, wxMemoryDC ! wxBufferedDC() ! %constructor wxBufferedDCFromSize(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA) ! %constructor wxBufferedDCFromBitmap(wxDC *dc, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) ! void Init(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA) ! %rename InitFromBitmap void Init(wxDC *dc, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) %endclass --- 1098,1107 ---- %class %delete wxBufferedDC, wxMemoryDC ! %overload wxBufferedDC() ! %overload %constructor wxBufferedDCFromSize(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA) ! %overload %constructor wxBufferedDCFromBitmap(wxDC *dc, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) ! %overload void Init(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA) ! %overload %rename InitFromBitmap void Init(wxDC *dc, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) %endclass *************** *** 1108,1113 **** %class %delete wxBufferedPaintDC, wxBufferedDC ! wxBufferedPaintDC(wxWindow *window, int style = wxBUFFER_CLIENT_AREA) ! %constructor wxBufferedPaintDCFromBitmap(wxWindow *window, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) %endclass --- 1112,1117 ---- %class %delete wxBufferedPaintDC, wxBufferedDC ! %overload wxBufferedPaintDC(wxWindow *window, int style = wxBUFFER_CLIENT_AREA) ! %overload %constructor wxBufferedPaintDCFromBitmap(wxWindow *window, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) %endclass *************** *** 1132,1144 **** %class %noclassinfo wxCaret wxCaret(wxWindow* window, const wxSize& size) ! %constructor wxDefaultCaret() ! %constructor wxCaretFromWidthHeight(wxWindow* window, int width, int height) ! bool Create(wxWindow* window, const wxSize& size) ! %rename CreateFromWidthHeight bool Create(wxWindow* window, int width, int height) static int GetBlinkTime() ! %rename GetPositionXY void GetPosition(int *x, int *y) wxPoint GetPosition() ! %rename GetSizeWH void GetSize(int *x, int *y) wxSize GetSize() wxWindow *GetWindow() --- 1136,1152 ---- %class %noclassinfo wxCaret wxCaret(wxWindow* window, const wxSize& size) ! %constructor wxCaretDefault() ! %constructor wxCaretFromWH(wxWindow* window, int width, int height) ! %overload bool Create(wxWindow* window, const wxSize& size) ! %overload %rename CreateFromWH bool Create(wxWindow* window, int width, int height) static int GetBlinkTime() ! // %override [int x, int y] wxCaret::GetPositionXY() ! //%rename GetPositionXY void GetPosition(int *x, int *y) ! %rename GetPositionXY void GetPosition() wxPoint GetPosition() ! // %override [int x, int y] wxCaret::GetSizeWH void GetSize() ! //%rename GetSizeWH void GetSize(int *x, int *y) ! %rename GetSizeWH void GetSize() wxSize GetSize() wxWindow *GetWindow() *************** *** 1146,1154 **** bool IsOk() bool IsVisible() ! %rename MoveXY void Move(int x, int y) ! void Move(const wxPoint& pt) static void SetBlinkTime(int ms) ! %rename SetSizeWH void SetSize(int width, int height) ! void SetSize(const wxSize& size) void Show(bool show = true) --- 1154,1162 ---- bool IsOk() bool IsVisible() ! %overload %rename MoveXY void Move(int x, int y) ! %overload void Move(const wxPoint& pt) static void SetBlinkTime(int ms) ! %overload %rename SetSizeWH void SetSize(int width, int height) ! %overload void SetSize(const wxSize& size) void Show(bool show = true) Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** override.hpp 17 May 2006 05:02:04 -0000 1.40 --- override.hpp 18 May 2006 05:47:39 -0000 1.41 *************** *** 681,684 **** --- 681,732 ---- %end + %override wxLua_wxListCtrl_SortItems + + static int wxLua_LCF_tag = -1; + static wxLuaState wxLua_LCF_wxlState; + + int wxCALLBACK wxLua_ListCompareFunction(long item1, long item2, long sortData) + { + lua_State *L = wxLua_LCF_wxlState.GetLuaState(); + lua_rawgeti(L, LUA_REGISTRYINDEX, wxLua_LCF_tag); + lua_pushnumber(L, item1); + lua_pushnumber(L, item2); + lua_pushnumber(L, sortData); + wxLua_LCF_wxlState.LuaCall(3, 1); + + int returns = (int)wxLua_LCF_wxlState.GetNumberType(1); + return returns; + } + + // bool SortItems(LuaFunction fnSortCallBack, long data) + static int LUACALL wxLua_wxListCtrl_SortItems(lua_State *L) + { + wxLuaState wxlState(L); + wxLua_LCF_wxlState = wxlState; + long returns; + // long data + long data = (long)wxlState.GetNumberType(3); + // get this + wxListCtrl *self = (wxListCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxListCtrl); + + lua_pop(L, 1); + // lua sort function, was index 2 is now index 1 + if (lua_isfunction (L, 1)) + wxLua_LCF_tag = luaL_ref(L, LUA_REGISTRYINDEX); // pops it from stack + else + wxlState.terror(wxString::Format(_("wxLua: Expected lua function for parameter %d, but got '%s'."), + 2, wxlState.lua_TypeNameIndex(1).c_str())); + + // call SortItems + returns = self->SortItems(wxLua_ListCompareFunction, data); + wxLua_LCF_wxlState.Destroy(); + wxLua_LCF_tag = -1; + // push the result number + lua_pushnumber(L, returns); + // return the number of parameters + return 1; + } + %end + %override wxLua_wxTextCtrl_GetSelection // virtual void GetSelection(long* from, long* to) *************** *** 724,730 **** %end ! %override wxLua_wxTextCtrl_HitTestPosition ! // wxTextCtrlHitTestResult HitTestPosition(const wxPoint& pt, long *pos) const ! static int LUACALL wxLua_wxTextCtrl_HitTestPosition(lua_State *L) { wxLuaState wxlState(L); --- 772,778 ---- %end ! %override wxLua_wxTextCtrl_HitTestPos ! // wxTextCtrlHitTestResult HitTestPos(const wxPoint& pt, long *pos) const ! static int LUACALL wxLua_wxTextCtrl_HitTestPos(lua_State *L) { wxLuaState wxlState(L); Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** datetime.i 17 May 2006 05:02:04 -0000 1.15 --- datetime.i 18 May 2006 05:47:39 -0000 1.16 *************** *** 131,135 **** %typedef wxDateTime::wxDateTime_t unsigned short ! %class %delete %noclassinfo %encapsulate wxDateTime // FIXME not updated %define %object wxDefaultDateTime --- 131,135 ---- %typedef wxDateTime::wxDateTime_t unsigned short ! %class %delete %noclassinfo %encapsulate wxDateTime %define %object wxDefaultDateTime *************** *** 189,196 **** wxDateTime& MakeGMT(bool noDST = false) int IsDST(wxDateTime::Country country = wxDateTime::Country_Default) const ! wxDateTime& Add(const wxTimeSpan& diff) ! wxDateTime& Subtract(const wxTimeSpan& diff) ! %rename AddDateSpan wxDateTime& Add(const wxDateSpan& diff) ! %rename SubtractDateSpan wxDateTime& Subtract(const wxDateSpan& diff) wxString ParseRfc822Date(wxString date) wxString ParseFormat(wxString date, wxString format = "%c", const wxDateTime& dateDef = wxDefaultDateTime) --- 189,196 ---- wxDateTime& MakeGMT(bool noDST = false) int IsDST(wxDateTime::Country country = wxDateTime::Country_Default) const ! %overload wxDateTime& Add(const wxTimeSpan& diff) ! %overload %rename AddDateSpan wxDateTime& Add(const wxDateSpan& diff) ! %overload wxDateTime& Subtract(const wxTimeSpan& diff) ! %overload %rename SubtractDateSpan wxDateTime& Subtract(const wxDateSpan& diff) wxString ParseRfc822Date(wxString date) wxString ParseFormat(wxString date, wxString format = "%c", const wxDateTime& dateDef = wxDefaultDateTime) Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** controls.i 17 May 2006 05:02:04 -0000 1.18 --- controls.i 18 May 2006 05:47:39 -0000 1.19 *************** *** 26,34 **** bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxButton") ! static wxSize GetDefaultSize() void SetDefault() ! //wxString GetLabel() const in wxWindow ! //void SetLabel(const wxString& label) in wxWindow %property=DefaultSize, read --- 26,34 ---- bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxButton") ! static wxSize GetDefaultSize() // static is ok, use on existing button void SetDefault() ! //wxString GetLabel() const // in wxWindow ! //void SetLabel(const wxString& label) // in wxWindow %property=DefaultSize, read *************** *** 45,57 **** wxBitmapButton( wxWindow* parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapButton") ! bool Create(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapButton") ! wxBitmap& GetBitmapDisabled() const ! wxBitmap& GetBitmapFocus() const ! wxBitmap& GetBitmapLabel() const ! wxBitmap& GetBitmapSelected() const ! void SetBitmapDisabled(const wxBitmap& bitmap) ! void SetBitmapFocus(const wxBitmap& bitmap) ! void SetBitmapLabel(const wxBitmap& bitmap) ! void SetBitmapSelected(const wxBitmap& bitmap) %property=BitmapDisabled, read, write --- 45,57 ---- wxBitmapButton( wxWindow* parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapButton") ! bool Create(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapButton") ! wxBitmap GetBitmapDisabled() const ! wxBitmap GetBitmapFocus() const ! wxBitmap GetBitmapLabel() const ! wxBitmap GetBitmapSelected() const ! void SetBitmapDisabled(const wxBitmap& bitmap) ! void SetBitmapFocus(const wxBitmap& bitmap) ! void SetBitmapLabel(const wxBitmap& bitmap) ! void SetBitmapSelected(const wxBitmap& bitmap) %property=BitmapDisabled, read, write *************** *** 78,83 **** bool GetValue() const ! //wxString GetLabel() const in wxWindow ! //void SetLabel(const wxString& label) in wxWindow %endclass --- 78,83 ---- bool GetValue() const ! //wxString GetLabel() const // in wxWindow ! //void SetLabel(const wxString& label) // in wxWindow %endclass *************** *** 104,115 **** wxCheckBox(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& val = wxDefaultValidator, const wxString& name = "wxCheckBox") ! bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& val = wxDefaultValidator, const wxString& name = "wxCheckBox") ! bool GetValue() const wxCheckBoxState Get3StateValue() const bool Is3rdStateAllowedForUser() const bool Is3State() const ! %wxchkver22&!%wxchkver23 %rename IsChecked bool GetValue() const ! %wxchkver23 bool IsChecked() const ! void SetValue(const bool state) void Set3StateValue(const wxCheckBoxState state) --- 104,114 ---- wxCheckBox(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& val = wxDefaultValidator, const wxString& name = "wxCheckBox") ! bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& val = wxDefaultValidator, const wxString& name = "wxCheckBox") ! bool GetValue() const wxCheckBoxState Get3StateValue() const bool Is3rdStateAllowedForUser() const bool Is3State() const ! bool IsChecked() const ! void SetValue(const bool state) void Set3StateValue(const wxCheckBoxState state) *************** *** 142,151 **** wxString GetString(int n) const wxString GetStringSelection() const - %overload int Insert(const wxString& item, int pos) //int Insert(const wxString& item, int pos, void *clientData) ! %overload %rename InsertWithClientData int Insert(const wxString& item, int pos, wxClientData *clientData) bool IsEmpty() const ! // int Number() const obsolete use GetCount() void Select(int n) //void SetClientData(int n, void *data) --- 141,149 ---- wxString GetString(int n) const wxString GetStringSelection() const %overload int Insert(const wxString& item, int pos) //int Insert(const wxString& item, int pos, void *clientData) ! %overload %rename InsertWithClientData int Insert(const wxString& item, int pos, wxClientData *clientData) bool IsEmpty() const ! // int Number() const // obsolete since 2.2 use GetCount() void Select(int n) //void SetClientData(int n, void *data) *************** *** 172,179 **** wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") ! bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") ! int GetCurrentSelection() const ! //int GetColumns() const // Motif only but returns 1 otherwise ! //void SetColumns(int n = 1) %endclass --- 170,177 ---- wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") ! bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") ! int GetCurrentSelection() const ! //int GetColumns() const // Motif only but returns 1 otherwise ! //void SetColumns(int n = 1) %endclass *************** *** 212,216 **** void SetInsertionPoint(long pos) void SetInsertionPointEnd() ! %rename SetMark void SetSelection(long from, long to) void SetValue(const wxString& text) void Undo() --- 210,214 ---- void SetInsertionPoint(long pos) void SetInsertionPointEnd() ! %rename SetMark void SetSelection(long from, long to) // wxPython name void SetValue(const wxString& text) void Undo() *************** *** 278,282 **** void Deselect(int n) // %override [lua table of int selections] wxListBox::GetSelections() ! int GetSelections(wxArrayInt& selections) const //void InsertItems(int nItems, const wxString items[], int pos) void InsertItems(const wxArrayString_FromLuaTable& items, int pos) --- 276,281 ---- void Deselect(int n) // %override [lua table of int selections] wxListBox::GetSelections() ! //int GetSelections(wxArrayInt& selections) const ! int GetSelections() const //void InsertItems(int nItems, const wxString items[], int pos) void InsertItems(const wxArrayString_FromLuaTable& items, int pos) *************** *** 319,323 **** %define wxLC_AUTOARRANGE %define wxLC_EDIT_LABELS ! %wxchkver23 %define wxLC_HRULES %define wxLC_ICON %define wxLC_LIST --- 318,322 ---- %define wxLC_AUTOARRANGE %define wxLC_EDIT_LABELS ! %define wxLC_HRULES %define wxLC_ICON %define wxLC_LIST *************** *** 333,337 **** %define wxLC_SORT_DESCENDING %define wxLC_USER_TEXT ! %wxchkver23 %define wxLC_VRULES %define wxLIST_ALIGN_DEFAULT --- 332,336 ---- %define wxLC_SORT_DESCENDING %define wxLC_USER_TEXT ! %define wxLC_VRULES %define wxLIST_ALIGN_DEFAULT *************** *** 381,385 **** bool Arrange(int flag = wxLIST_ALIGN_DEFAULT) ! %wxchkver22&!%wxchkver23 %rename AssignImageList void SetImageList(wxImageList *imageList, int which) %wxchkver23 void AssignImageList(wxImageList *imageList, int which) void ClearAll() --- 380,384 ---- bool Arrange(int flag = wxLIST_ALIGN_DEFAULT) ! //%wxchkver22&!%wxchkver23 %rename AssignImageList void SetImageList(wxImageList *imageList, int which) %wxchkver23 void AssignImageList(wxImageList *imageList, int which) void ClearAll() *************** *** 390,396 **** void EditLabel(long item) bool EnsureVisible(long item) ! long FindItem(long start, const wxString& str, const bool partial = false) ! %rename FindItemData long FindItem(long start, long data) ! %rename FindItemAtPos long FindItem(long start, const wxPoint& pt, int direction) bool GetColumn(int col, wxListItem& item) const int GetColumnCount() const --- 389,395 ---- void EditLabel(long item) bool EnsureVisible(long item) ! %overload long FindItem(long start, const wxString& str, const bool partial = false) ! %overload %rename FindItemData long FindItem(long start, long data) ! %overload %rename FindItemAtPos long FindItem(long start, const wxPoint& pt, int direction) bool GetColumn(int col, wxListItem& item) const int GetColumnCount() const *************** *** 415,425 **** wxRect GetViewRect() const // %override [long, int flags] wxListCtrl::HitTest(const wxPoint& point) ! long HitTest(const wxPoint& point, int& flags) ! long InsertColumn(long col, wxListItem& info) ! %rename InsertColumnItem long InsertColumn(long col, const wxString& heading, int format = wxLIST_FORMAT_LEFT, int width = -1) long InsertItem(wxListItem& info) ! %rename InsertStringItem long InsertItem(long index, const wxString& label) ! %rename InsertImageItem long InsertItem(long index, int imageIndex) ! %rename InsertImageStringItem long InsertItem(long index, const wxString& label, int imageIndex) //virtual wxListItemAttr * OnGetItemAttr(long item) const //virtual int OnGetItemImage(long item) --- 414,425 ---- wxRect GetViewRect() const // %override [long, int flags] wxListCtrl::HitTest(const wxPoint& point) ! //long HitTest(const wxPoint& point, int& flags) ! long HitTest(const wxPoint& point) ! %overload %rename InsertColumnItem long InsertColumn(long col, wxListItem& info) // wxPython name ! %overload long InsertColumn(long col, const wxString& heading, int format = wxLIST_FORMAT_LEFT, int width = -1) long InsertItem(wxListItem& info) ! %rename InsertStringItem long InsertItem(long index, const wxString& label) // wxPython name ! %rename InsertImageItem long InsertItem(long index, int imageIndex) // wxPython name ! %rename InsertImageStringItem long InsertItem(long index, const wxString& label, int imageIndex) // wxPython name //virtual wxListItemAttr * OnGetItemAttr(long item) const //virtual int OnGetItemImage(long item) *************** *** 433,437 **** void SetImageList(wxImageList* imageList, int which) bool SetItem(wxListItem& info) ! %rename SetStringItem long SetItem(long index, int col, const wxString& label, int imageId = -1) void SetItemBackgroundColour(long item, const wxColour& col) //void SetItemCount(long count) --- 433,437 ---- void SetImageList(wxImageList* imageList, int which) bool SetItem(wxListItem& info) ! %rename SetStringItem long SetItem(long index, int col, const wxString& label, int imageId = -1) // wxPython name void SetItemBackgroundColour(long item, const wxColour& col) //void SetItemCount(long count) *************** *** 445,449 **** void SetTextColour(const wxColour& col) void SetWindowStyleFlag(long style) ! //bool SortItems(wxListCtrlCompare fnSortCallBack, long data) FIXME add %property=CountPerPage, read --- 445,451 ---- void SetTextColour(const wxColour& col) void SetWindowStyleFlag(long style) ! // %overload bool SortItems(lua function(long item1, long item2, long sortData) returning int, long data) ! //bool SortItems(wxListCtrlCompare fnSortCallBack, long data) ! bool SortItems(LuaFunction fnSortCallBack, long data) %property=CountPerPage, read *************** *** 624,628 **** wxRadioBox(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") ! // these are marked deprecated in 2.6, use wxControl::Get/SetLabel //wxString GetLabel() const //void SetLabel(const wxString& label) --- 626,630 ---- wxRadioBox(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") ! // these are marked deprecated in 2.6, use wxControl::Get/SetLabel/String //wxString GetLabel() const //void SetLabel(const wxString& label) *************** *** 631,636 **** bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") ! void Enable(bool enable) ! %rename EnableItem void Enable(int n, bool enable) int FindString(const wxString& string) const int GetCount() const --- 633,638 ---- bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") ! %overload void Enable(bool enable) ! %overload %rename EnableItem void Enable(int n, bool enable) int FindString(const wxString& string) const int GetCount() const *************** *** 641,646 **** void SetSelection(int n) void SetStringSelection(const wxString& string) ! bool Show(bool show = true) ! %rename ShowItem bool Show(int item, bool show = true) %property=Count, read --- 643,648 ---- void SetSelection(int n) void SetStringSelection(const wxString& string) ! %overload bool Show(bool show = true) ! %overload %rename ShowItem bool Show(int item, bool show = true) %property=Count, read *************** *** 824,829 **** void SetRange(int minVal, int maxVal) void SetSelection(long from, long to) ! void SetValue(const wxString& text) ! %rename SetValueInt void SetValue(int iValue) %property=Max, read --- 826,831 ---- void SetRange(int minVal, int maxVal) void SetSelection(long from, long to) ! %overload void SetValue(const wxString& text) ! %overload %rename SetValueInt void SetValue(int iValue) %property=Max, read *************** *** 902,908 **** wxString GetValue() const // %override [wxTextCtrlHitTestResult, int col, int row] wxTextCtrl::HitTest(const wxPoint& pt) ! wxTextCtrlHitTestResult HitTest(const wxPoint& pt, wxTextCoord *col, wxTextCoord *row) const ! // %override [wxTextCtrlHitTestResult, int pos] wxTextCtrl::HitTestPosition(const wxPoint& pt) ! %rename HitTestPosition wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const bool IsEditable() const bool IsModified() const --- 904,912 ---- wxString GetValue() const // %override [wxTextCtrlHitTestResult, int col, int row] wxTextCtrl::HitTest(const wxPoint& pt) ! //wxTextCtrlHitTestResult HitTest(const wxPoint& pt, wxTextCoord *col, wxTextCoord *row) const ! wxTextCtrlHitTestResult HitTest(const wxPoint& pt) const ! // %override [wxTextCtrlHitTestResult, int pos] wxTextCtrl::HitTestPos(const wxPoint& pt) ! //%rename HitTestPos wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const ! %rename HitTestPos wxTextCtrlHitTestResult HitTest(const wxPoint& pt) const bool IsEditable() const bool IsModified() const *************** *** 1091,1096 **** // %override [wxTreeItemId, int flags] wxTreeCtrl::HitTest(const wxPoint& point) wxTreeItemId HitTest(const wxPoint& point, int& flags) ! wxTreeItemId InsertItem(const wxTreeItemId& parent, const wxTreeItemId& previous, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL) ! %rename InsertItemBefore wxTreeItemId InsertItem(const wxTreeItemId& parent, size_t before, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL) bool IsBold(const wxTreeItemId& item) const bool IsExpanded(const wxTreeItemId& item) const --- 1095,1100 ---- // %override [wxTreeItemId, int flags] wxTreeCtrl::HitTest(const wxPoint& point) wxTreeItemId HitTest(const wxPoint& point, int& flags) ! %overload wxTreeItemId InsertItem(const wxTreeItemId& parent, const wxTreeItemId& previous, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL) ! %overload %rename InsertItemBefore wxTreeItemId InsertItem(const wxTreeItemId& parent, size_t before, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL) bool IsBold(const wxTreeItemId& item) const bool IsExpanded(const wxTreeItemId& item) const Index: clipdrag.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** clipdrag.i 17 May 2006 05:02:04 -0000 1.17 --- clipdrag.i 18 May 2006 05:47:39 -0000 1.18 *************** *** 19,23 **** %class wxClipboard, wxObject !%wxchkver25 %define %pointer wxTheClipboard ! %wxchkver25 %static wxClipboard *Get() // wxClipboard() use global clipboard only --- 19,23 ---- %class wxClipboard, wxObject !%wxchkver25 %define %pointer wxTheClipboard ! %wxchkver25 %staticonly wxClipboard *Get() // wxClipboard() use global clipboard only *************** *** 70,75 **** %define %object wxFormatInvalid ! wxDataFormat(wxDataFormatId format = wxDF_INVALID) ! %constructor wxDataFormatUser(const wxString &format) wxString GetId() const int GetType() const // returns wxDataFormatId, but it's just an int and msw differs --- 70,76 ---- %define %object wxFormatInvalid ! %override wxDataFormat(wxDataFormatId format = wxDF_INVALID) ! %override %constructor wxDataFormatUser(const wxString &format) ! wxString GetId() const int GetType() const // returns wxDataFormatId, but it's just an int and msw differs *************** *** 78,82 **** %operator bool operator==(const wxDataFormat& format) const - %operator bool operator!=(const wxDataFormat& format) const %property=Id, read, write --- 79,82 ---- *************** *** 96,108 **** // %override [lua table of wxDataFormat objects] wxDataObject::GetAllFormats(wxDataObject::Direction dir = wxDataObject) ! virtual void GetAllFormats(wxDataFormat *formats, wxDataObject::Direction dir = wxDataObject::Get) const ! // %override [bool, lua string] wxDataObject::GetDataHere(const wxDataFormat& format) ! virtual bool GetDataHere(const wxDataFormat& format, void *buf) const virtual int GetDataSize(const wxDataFormat& format) const virtual int GetFormatCount(wxDataObject::Direction dir = wxDataObject::Get) const virtual wxDataFormat GetPreferredFormat(wxDataObject::Direction dir = wxDataObject::Get) const // %override bool wxDataObject::SetData(const wxDataFormat& format, lua string) ! virtual bool SetData(const wxDataFormat& format, int len, const void *buf) %endclass --- 96,110 ---- // %override [lua table of wxDataFormat objects] wxDataObject::GetAllFormats(wxDataObject::Direction dir = wxDataObject) ! //virtual void GetAllFormats(wxDataFormat *formats, wxDataObject::Direction dir = wxDataObject::Get) const ! virtual void GetAllFormats(wxDataObject::Direction dir = wxDataObject::Get) const // %override [bool, lua string] wxDataObject::GetDataHere(const wxDataFormat& format) ! //virtual bool GetDataHere(const wxDataFormat& format, void *buf) const ! virtual bool GetDataHere(const wxDataFormat& format) const virtual int GetDataSize(const wxDataFormat& format) const virtual int GetFormatCount(wxDataObject::Direction dir = wxDataObject::Get) const virtual wxDataFormat GetPreferredFormat(wxDataObject::Direction dir = wxDataObject::Get) const // %override bool wxDataObject::SetData(const wxDataFormat& format, lua string) ! //virtual bool SetData(const wxDataFormat& format, int len, const void *buf) ! virtual bool SetData(const wxDataFormat& format, const wxString& str) %endclass *************** *** 117,123 **** virtual size_t GetDataSize() const // %override [bool, lua string] wxDataObjectSimple::GetDataHere() ! virtual bool GetDataHere(void *buf) const // %override bool wxDataObjectSimple::SetData(lua string) ! virtual bool SetData(size_t len, const void *buf) %property=DataSize, read --- 119,127 ---- virtual size_t GetDataSize() const // %override [bool, lua string] wxDataObjectSimple::GetDataHere() ! //virtual bool GetDataHere(void *buf) const ! virtual bool GetDataHere() const // %override bool wxDataObjectSimple::SetData(lua string) ! //virtual bool SetData(size_t len, const void *buf) ! virtual bool SetData(const wxString& str) %property=DataSize, read *************** *** 283,286 **** --- 287,291 ---- ... [truncated message content] |
