Menu
▾
▴
[Wxlua-commit] wxLua/bindings/wxwidgets appframe.i, 1.32, 1.33 clipdrag.i, 1.24, 1.25 config.i, 1.19, 1.20 controls.i, 1.34, 1.35 data.i, 1.27, 1.28 datetime.i, 1.25, 1.26 defsutil.i, 1.41, 1.42 dialogs.i, 1.28, 1.29 event.i, 1.21, 1.22 file.i, 1.21, 1.22 gdi.i, 1.46, 1.47 grid.i, 1.12, 1.13 help.i, 1.13, 1.14 html.i, 1.17, 1.18 image.i, 1.24, 1.25 mdi.i, 1.12, 1.13 menutool.i, 1.15, 1.16 override.hpp, 1.66, 1.67 print.i, 1.15, 1.16 regex.i, 1.7, 1.8 socket.i, 1.11, 1.12 windows.i, 1.34, 1.35 xml.i, 1.9, 1.10
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11100/wxLua/bindings/wxwidgets Modified Files: appframe.i clipdrag.i config.i controls.i data.i datetime.i defsutil.i dialogs.i event.i file.i gdi.i grid.i help.i html.i image.i mdi.i menutool.i override.hpp print.i regex.i socket.i windows.i xml.i Log Message: More cleanup, remove %rename tag for functions that can be overloaded Format %override text in .i files uniformly Remove wxConfig::Read/WriteInt/Float since lua uses double, just have Read/Write Index: menutool.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** menutool.i 31 May 2007 17:18:46 -0000 1.15 --- menutool.i 31 May 2007 21:38:39 -0000 1.16 *************** *** 28,32 **** %class wxMenu, wxEvtHandler wxMenu(const wxString& title = "", long style = 0) ! // %override wxMenu* wxCreateMenu({{wx.wxID_NEW, "&New\tCtrl-N", "New doc", [wx.wxITEM_NORMAL]}, {}, {item 2}}, const wxString& title = "", long style = "") - empty tables are separators %override_name wxLua_wxCreateMenu_constructor wxMenu(LuaTable luatable, const wxString& title = "", long style = 0) --- 28,33 ---- %class wxMenu, wxEvtHandler wxMenu(const wxString& title = "", long style = 0) ! ! // %override wxMenu* wxMenu({{wx.wxID_NEW, "&New\tCtrl-N", "New doc", [wx.wxITEM_NORMAL]}, {}, {item 2}}, const wxString& title = "", long style = "") - empty tables are separators %override_name wxLua_wxCreateMenu_constructor wxMenu(LuaTable luatable, const wxString& title = "", long style = 0) *************** *** 45,50 **** void Enable(int id, bool enable) int FindItem(const wxString& itemString) const ! // %override [wxMenuItem* menuItem, wxMenu* ownerMenu] wxMenu::FindItemById(int id) ! %rename FindItemById wxMenuItem* FindItem(int id, wxMenu **menu = NULL) const wxMenuItem* FindItemByPosition(size_t position) const wxString GetHelpString(int id) const --- 46,54 ---- void Enable(int id, bool enable) int FindItem(const wxString& itemString) const ! ! // %override [wxMenuItem* menuItem, wxMenu* ownerMenu] wxMenu::FindItem(int id) ! // wxMenuItem* FindItem(int id, wxMenu **menu = NULL) const ! %override_name wxLua_wxMenu_FindItemById wxMenuItem* FindItem(int id) const ! wxMenuItem* FindItemByPosition(size_t position) const wxString GetHelpString(int id) const Index: clipdrag.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** clipdrag.i 31 May 2007 17:18:46 -0000 1.24 --- clipdrag.i 31 May 2007 21:38:38 -0000 1.25 *************** *** 116,130 **** // %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 --- 116,134 ---- // %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 *************** *** 138,147 **** void SetFormat(const wxDataFormat& format) 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) %endclass --- 142,154 ---- void SetFormat(const wxDataFormat& format) 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) + %endclass *************** *** 301,305 **** --- 308,314 ---- // %override [lua table of strings] wxDropFilesEvent::GetFiles() + // wxString* GetFiles() const wxString* GetFiles() const + int GetNumberOfFiles() const wxPoint GetPosition() const Index: data.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** data.i 31 May 2007 17:18:46 -0000 1.27 --- data.i 31 May 2007 21:38:38 -0000 1.28 *************** *** 55,60 **** //void Dump(ostream& stream) ! // %override [new class type] wxObject::DynamicCast() converts the wxObject to an object of type classname void *DynamicCast(const wxString &classname) wxClassInfo* GetClassInfo() wxObjectRefData* GetRefData() const --- 55,63 ---- //void Dump(ostream& stream) ! ! // %override [new class type] wxObject::DynamicCast() converts the wxObject ! // to an object of type classname void *DynamicCast(const wxString &classname) + wxClassInfo* GetClassInfo() wxObjectRefData* GetRefData() const *************** *** 156,166 **** %class %delete %noclassinfo wxGenericValidator, wxValidator // FIXME test this // %override wxGenericValidatorBool for wxCheckBox and wxRadioButton, input is wxLuaObject ? ! %constructor wxGenericValidatorBool(bool *boolPtr) // for wxButton and wxComboBox, wxStaticText and wxTextCtrl ! %constructor wxGenericValidatorString(wxString *valPtr) // for wxGauge, wxScrollBar, wxRadioBox, wxSpinButton, wxChoice ! %constructor wxGenericValidatorInt(int *valPtr) // for wxListBox and wxCheckListBox ! %constructor wxGenericValidatorArray(wxArrayInt *valPtr) %endclass --- 159,173 ---- %class %delete %noclassinfo wxGenericValidator, wxValidator // FIXME test this // %override wxGenericValidatorBool for wxCheckBox and wxRadioButton, input is wxLuaObject ? ! %rename wxGenericValidatorBool wxGenericValidator(bool *boolPtr) ! // for wxButton and wxComboBox, wxStaticText and wxTextCtrl ! %rename wxGenericValidatorString wxGenericValidator(wxString *valPtr) ! // for wxGauge, wxScrollBar, wxRadioBox, wxSpinButton, wxChoice ! %rename wxGenericValidatorInt wxGenericValidator(int *valPtr) ! // for wxListBox and wxCheckListBox ! %rename wxGenericValidatorArray wxGenericValidator(wxArrayInt *valPtr) ! %endclass Index: print.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** print.i 31 May 2007 17:18:47 -0000 1.15 --- print.i 31 May 2007 21:38:40 -0000 1.16 *************** *** 22,35 **** wxDC * GetDC() // %override [int minPage, int maxPage, int pageFrom, int pageTo] wxPrintout::GetPageInfo() ! void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) // %override [int w, int h] wxPrintout::GetPageSizeMM() ! void GetPageSizeMM(int *w, int *h) // %override [int w, int h] wxPrintout::GetPageSizePixels() ! void GetPageSizePixels(int *w, int *h) // %override [int w, int h] wxPrintout::GetPPIPrinter() ! void GetPPIPrinter(int *w, int *h) // %override [int w, int h] wxPrintout::GetPPIScreen() ! void GetPPIScreen(int *w, int *h) wxString GetTitle() bool HasPage(int pageNum) --- 22,46 ---- wxDC * GetDC() + // %override [int minPage, int maxPage, int pageFrom, int pageTo] wxPrintout::GetPageInfo() ! // void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) ! void GetPageInfo() ! // %override [int w, int h] wxPrintout::GetPageSizeMM() ! // void GetPageSizeMM(int *w, int *h) ! void GetPageSizeMM() ! // %override [int w, int h] wxPrintout::GetPageSizePixels() ! // void GetPageSizePixels(int *w, int *h) ! void GetPageSizePixels() ! // %override [int w, int h] wxPrintout::GetPPIPrinter() ! // void GetPPIPrinter(int *w, int *h) ! void GetPPIPrinter() ! // %override [int w, int h] wxPrintout::GetPPIScreen() ! // void GetPPIScreen(int *w, int *h) ! void GetPPIScreen() ! wxString GetTitle() bool HasPage(int pageNum) *************** *** 325,330 **** bool Ok() const void SetPaperSize(const wxSize& sz) void SetPaperId(wxPaperSize id) - //%rename SetPaperSizeById void SetPaperSize(wxPaperSize id) void SetMinMarginTopLeft(const wxPoint& pt) void SetMinMarginBottomRight(const wxPoint& pt) --- 336,341 ---- bool Ok() const void SetPaperSize(const wxSize& sz) + void SetPaperSize(wxPaperSize id) void SetPaperId(wxPaperSize id) void SetMinMarginTopLeft(const wxPoint& pt) void SetMinMarginBottomRight(const wxPoint& pt) Index: file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** file.i 31 May 2007 17:18:46 -0000 1.21 --- file.i 31 May 2007 21:38:39 -0000 1.22 *************** *** 177,182 **** --- 177,185 ---- static wxString GetCwd(const wxString& volume = "") int GetDirCount() const + // %override [lua string table] wxFileName::GetDirs() + // const wxArrayString& GetDirs() const const wxArrayString& GetDirs() const + wxString GetExt() const static wxString GetForbiddenChars(wxPathFormat format = wxPATH_NATIVE) *************** *** 198,203 **** %wxchkver_2_8 wxULongLong GetSize() const //%wxchkver_2_8 static wxULongLong GetSize(const wxString &file) // %override [bool, wxDateTime dtAccess, wxDateTime dtMod, wxDateTime dtCreate] wxFileName::GetTimes() ! bool GetTimes(wxDateTime* dtAccess, wxDateTime* dtMod, wxDateTime* dtCreate) const wxString GetVolume() const static wxString GetVolumeSeparator(wxPathFormat format = wxPATH_NATIVE) --- 201,209 ---- %wxchkver_2_8 wxULongLong GetSize() const //%wxchkver_2_8 static wxULongLong GetSize(const wxString &file) + // %override [bool, wxDateTime dtAccess, wxDateTime dtMod, wxDateTime dtCreate] wxFileName::GetTimes() ! // bool GetTimes(wxDateTime* dtAccess, wxDateTime* dtMod, wxDateTime* dtCreate) const ! bool GetTimes() const ! wxString GetVolume() const static wxString GetVolumeSeparator(wxPathFormat format = wxPATH_NATIVE) *************** *** 242,254 **** bool SetTimes(const wxDateTime* dtAccess, const wxDateTime* dtMod, const wxDateTime* dtCreate) 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() --- 248,264 ---- bool SetTimes(const wxDateTime* dtAccess, const wxDateTime* dtMod, const wxDateTime* dtCreate) 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) ! // 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() *************** *** 323,334 **** wxFileOffset Length() const bool Open(const wxString& filename, wxFile::OpenMode mode = wxFile::read) // %override [size_t count, lua string] wxFile::Read(unsigned int count) ! size_t Read(void* buffer, unsigned int count) wxFileOffset Seek(wxFileOffset offset, wxSeekMode mode = wxFromStart) wxFileOffset SeekEnd(wxFileOffset offset = 0) 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) size_t Write(const wxString &str) //, const wxMBConv& conv = wxConvUTF8) %endclass --- 333,349 ---- wxFileOffset Length() const bool Open(const wxString& filename, wxFile::OpenMode mode = wxFile::read) + // %override [size_t count, lua string] wxFile::Read(unsigned int count) ! // size_t Read(void* buffer, unsigned int count) ! size_t Read(unsigned int count) ! wxFileOffset Seek(wxFileOffset offset, wxSeekMode mode = wxFromStart) wxFileOffset SeekEnd(wxFileOffset offset = 0) 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) + size_t Write(const wxString &str) //, const wxMBConv& conv = wxConvUTF8) %endclass *************** *** 387,397 **** static bool Exists(const wxString& dir) // %override [unsigned int, lua string table] wxDir::GetAllFiles(const wxString& dirname, const wxString& filespec = "", int flags = wxDIR_DEFAULT) ! static unsigned int GetAllFiles(const wxString& dirname, wxArrayString *files, const wxString& filespec = "", int flags = wxDIR_DEFAULT) // %override [bool, string filename] wxDir::GetFirst(const wxString& filespec = "", int flags = wxDIR_DEFAULT) ! bool GetFirst(wxString * filename, const wxString& filespec = "", int flags = wxDIR_DEFAULT) const wxString GetName() const // %override [bool, string filename] wxDir::GetNext() ! bool GetNext(wxString * filename) const bool HasFiles(const wxString& filespec = "") bool HasSubDirs(const wxString& dirspec = "") --- 402,420 ---- static bool Exists(const wxString& dir) + // %override [unsigned int, lua string table] wxDir::GetAllFiles(const wxString& dirname, const wxString& filespec = "", int flags = wxDIR_DEFAULT) ! // static unsigned int GetAllFiles(const wxString& dirname, wxArrayString *files, const wxString& filespec = "", int flags = wxDIR_DEFAULT) ! static unsigned int GetAllFiles(const wxString& dirname, const wxString& filespec = "", int flags = wxDIR_DEFAULT) ! // %override [bool, string filename] wxDir::GetFirst(const wxString& filespec = "", int flags = wxDIR_DEFAULT) ! // bool GetFirst(wxString * filename, const wxString& filespec = "", int flags = wxDIR_DEFAULT) const ! bool GetFirst(const wxString& filespec = "", int flags = wxDIR_DEFAULT) const ! wxString GetName() const + // %override [bool, string filename] wxDir::GetNext() ! // bool GetNext(wxString * filename) const ! bool GetNext() const ! bool HasFiles(const wxString& filespec = "") bool HasSubDirs(const wxString& dirspec = "") *************** *** 455,467 **** size_t LastRead() const char Peek() // %override [lua string] wxInputStream::Read(size_t size) ! //wxInputStream& Read(void *buffer, size_t size) ! wxInputStream& Read(size_t size) 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 --- 478,494 ---- size_t LastRead() const char Peek() + // %override [lua string] wxInputStream::Read(size_t size) ! // wxInputStream& Read(void *buffer, size_t size) ! wxString Read(size_t size) ! wxInputStream& Read(wxOutputStream& stream_in) wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart) wxFileOffset TellI() const ! ! // %override size_t wxInputStream::Ungetch(lua string, size_t size) ! // size_t Ungetch(const char* buffer, size_t size) ! %override_name wxLua_wxInputStream_UngetchString size_t Ungetch(const wxString& str, size_t size) ! bool Ungetch(char c) %endclass *************** *** 478,484 **** wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart) 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) wxOutputStream& Write(wxInputStream& stream_in) %endclass --- 505,513 ---- wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart) 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) + wxOutputStream& Write(wxInputStream& stream_in) %endclass Index: regex.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/regex.i,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** regex.i 31 May 2007 17:18:47 -0000 1.7 --- regex.i 31 May 2007 21:38:40 -0000 1.8 *************** *** 36,50 **** bool IsValid() const wxString GetMatch(const wxString& text, size_t index = 0) const ! // %override [bool, size_t start, size_t len] wxRegEx::GetMatchIndexes(size_t index = 0) const ! %rename GetMatchIndexes bool GetMatch(size_t* start, size_t* len, size_t index = 0) const size_t GetMatchCount() const // Note: only need this form of Matches bool Matches(const wxString &text, int flags = 0) const // %override [int, string text] Replace(const wxString& text, const wxString& replacement, size_t maxMatches = 0) const ! int Replace(wxString* text, const wxString& replacement, size_t maxMatches = 0) const // %override [int, string text] ReplaceAll(const wxString& text, const wxString& replacement) const ! int ReplaceAll(wxString* text, const wxString& replacement) const // %override [int, string text] ReplaceFirst(const wxString& text, const wxString& replacement) const ! int ReplaceFirst(wxString* text, const wxString& replacement) const %endclass --- 36,60 ---- bool IsValid() const wxString GetMatch(const wxString& text, size_t index = 0) const ! ! // %override [bool, size_t start, size_t len] wxRegEx::GetMatch(size_t index = 0) const ! // bool GetMatch(size_t* start, size_t* len, size_t index = 0) const ! %override_name wxLua_wxRegEx_GetMatchIndexes bool GetMatch(size_t index = 0) const ! size_t GetMatchCount() const // Note: only need this form of Matches bool Matches(const wxString &text, int flags = 0) const + // %override [int, string text] Replace(const wxString& text, const wxString& replacement, size_t maxMatches = 0) const ! // int Replace(wxString* text, const wxString& replacement, size_t maxMatches = 0) const ! int Replace(const wxString& text, const wxString& replacement, size_t maxMatches = 0) const ! // %override [int, string text] ReplaceAll(const wxString& text, const wxString& replacement) const ! // int ReplaceAll(wxString* text, const wxString& replacement) const ! int ReplaceAll(const wxString& text, const wxString& replacement) const ! // %override [int, string text] ReplaceFirst(const wxString& text, const wxString& replacement) const ! // int ReplaceFirst(wxString* text, const wxString& replacement) const ! int ReplaceFirst(const wxString& text, const wxString& replacement) const ! %endclass Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** dialogs.i 31 May 2007 17:18:46 -0000 1.28 --- dialogs.i 31 May 2007 21:38:39 -0000 1.29 *************** *** 240,243 **** --- 240,244 ---- wxString GetDirectory() const wxString GetFilename() const + // %override [lua string table] wxFileDialog::GetFilenames() // void GetFilenames(wxArrayString& filenames) const *************** *** 247,250 **** --- 248,252 ---- wxString GetMessage() const wxString GetPath() const + // %override [lua string table] wxFileDialog::GetPaths() // void GetPaths(wxArrayString& paths) const *************** *** 328,332 **** %class wxSingleChoiceDialog, wxDialog ! // %override wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, void** clientData = NULL, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) --- 330,335 ---- %class wxSingleChoiceDialog, wxDialog ! // %override wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, void** clientData = NULL, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) ! // wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, void** clientData = NULL, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) *************** *** 490,495 **** void Resume() // %override [bool, bool skip] Update(int value, const wxString& newmsg = "") ! bool Update(int value, const wxString& newmsg = "", bool* skip = NULL) %endclass --- 493,501 ---- void Resume() + // %override [bool, bool skip] Update(int value, const wxString& newmsg = "") ! // bool Update(int value, const wxString& newmsg = "", bool* skip = NULL) ! bool Update(int value, const wxString& newmsg = "") ! %endclass Index: xml.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/xml.i,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** xml.i 31 May 2007 17:18:47 -0000 1.9 --- xml.i 31 May 2007 21:38:40 -0000 1.10 *************** *** 34,64 **** %class %delete %noclassinfo %encapsulate wxXmlNode wxXmlNode() ! wxXmlNode(wxXmlNodeType type, const wxString& name, const wxString& content = wxEmptyString); ! wxXmlNode(wxXmlNode *parent, wxXmlNodeType type, const wxString& name, const wxString& content, wxXmlProperty *props, wxXmlNode *next); ! void AddChild(wxXmlNode *child); ! void InsertChild(wxXmlNode *child, wxXmlNode *before_node); ! bool RemoveChild(wxXmlNode *child); ! void AddProperty(const wxString& name, const wxString& value); ! bool DeleteProperty(const wxString& name); ! wxXmlNodeType GetType() const; ! wxString GetName() const; ! wxString GetContent() const; ! wxXmlNode *GetParent() const; ! wxXmlNode *GetNext() const; ! wxXmlNode *GetChildren() const; ! wxXmlProperty *GetProperties() const; ! // %override [bool string] wxXmlNode::GetPropValPtr(const wxString& propName) const; ! %rename GetPropValPtr bool GetPropVal(const wxString& propName, wxString *value) const; ! wxString GetPropVal(const wxString& propName, const wxString& defaultVal) const; ! bool HasProp(const wxString& propName) const; ! void SetType(wxXmlNodeType type); ! void SetName(const wxString& name); ! void SetContent(const wxString& con); ! void SetParent(wxXmlNode *parent); ! void SetNext(wxXmlNode *next); ! void SetChildren(wxXmlNode *child); ! void SetProperties(wxXmlProperty *prop); ! void AddProperty(wxXmlProperty *prop); %endclass --- 34,67 ---- %class %delete %noclassinfo %encapsulate wxXmlNode wxXmlNode() ! wxXmlNode(wxXmlNodeType type, const wxString& name, const wxString& content = wxEmptyString) ! wxXmlNode(wxXmlNode *parent, wxXmlNodeType type, const wxString& name, const wxString& content, wxXmlProperty *props, wxXmlNode *next) ! void AddChild(wxXmlNode *child) ! void InsertChild(wxXmlNode *child, wxXmlNode *before_node) ! bool RemoveChild(wxXmlNode *child) ! void AddProperty(const wxString& name, const wxString& value) ! bool DeleteProperty(const wxString& name) ! wxXmlNodeType GetType() const ! wxString GetName() const ! wxString GetContent() const ! wxXmlNode *GetParent() const ! wxXmlNode *GetNext() const ! wxXmlNode *GetChildren() const ! wxXmlProperty *GetProperties() const ! ! // %override [bool string] wxXmlNode::GetPropValPtr(const wxString& propName) const ! // bool GetPropVal(const wxString& propName, wxString *value) const ! %override_name wxLua_wxXmlNode_GetPropValPtr bool GetPropVal(const wxString& propName) const ! ! wxString GetPropVal(const wxString& propName, const wxString& defaultVal) const ! bool HasProp(const wxString& propName) const ! void SetType(wxXmlNodeType type) ! void SetName(const wxString& name) ! void SetContent(const wxString& con) ! void SetParent(wxXmlNode *parent) ! void SetNext(wxXmlNode *next) ! void SetChildren(wxXmlNode *child) ! void SetProperties(wxXmlProperty *prop) ! void AddProperty(wxXmlProperty *prop) %endclass Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** windows.i 31 May 2007 17:18:47 -0000 1.34 --- windows.i 31 May 2007 21:38:40 -0000 1.35 *************** *** 16,20 **** %include "wx/utils.h" ! %class %delete %noclassinfo %encapsulate wxWindowDisabler // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough wxWindowDisabler(wxWindow *winToSkip = NULL) --- 16,20 ---- %include "wx/utils.h" ! %class %noclassinfo %encapsulate %delete wxWindowDisabler // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough wxWindowDisabler(wxWindow *winToSkip = NULL) *************** *** 87,92 **** !%wxchkver_2_5 void Clear() %wxchkver_2_5 void ClearBackground() // %override [int x, int y] ClientToScreen(int x, int y) const ! %override_name wxLua_wxWindow_ClientToScreenXY virtual void ClientToScreen(int x, int y) const //(int* x, int* y) const virtual wxPoint ClientToScreen(const wxPoint& pt) const virtual bool Close(bool force = false) --- 87,95 ---- !%wxchkver_2_5 void Clear() %wxchkver_2_5 void ClearBackground() + // %override [int x, int y] ClientToScreen(int x, int y) const ! // virtual void ClientToScreen(int* x, int* y) const ! %override_name wxLua_wxWindow_ClientToScreenXY virtual void ClientToScreen(int x, int y) const ! virtual wxPoint ClientToScreen(const wxPoint& pt) const virtual bool Close(bool force = false) *************** *** 124,129 **** wxWindowList& GetChildren() //static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL) ! // %override [int width, int height] wxWindow::GetClientSize() const ! %rename GetClientSizeWH virtual void GetClientSize(int* width, int* height) const wxSize GetClientSize() const !%wxchkver_2_6 wxLayoutConstraints* GetConstraints() const // deprecated use sizers --- 127,135 ---- wxWindowList& GetChildren() //static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL) ! ! // %override [int width, int height] wxWindow::GetClientSizeWH() const ! // virtual void GetClientSize(int* width, int* height) const ! %rename GetClientSizeWH virtual void GetClientSize() const ! wxSize GetClientSize() const !%wxchkver_2_6 wxLayoutConstraints* GetConstraints() const // deprecated use sizers *************** *** 146,151 **** virtual wxString GetName() const virtual wxWindow* GetParent() const ! // %override [int x, int y] GetPosition(int x, int y) const - specify dummy x to get overload ! %override_name wxLua_wxWindow_GetPositionXY %rename GetPositionXY virtual void GetPosition(int x, int y=0) const // (int* x, int* y) const wxPoint GetPosition() const virtual wxRect GetRect() const --- 152,160 ---- virtual wxString GetName() const virtual wxWindow* GetParent() const ! ! // %override [int x, int y] GetPosition(int x, int y) const ! // virtual void GetPosition(int* x, int* y) const ! %override_name wxLua_wxWindow_GetPositionXY %rename GetPositionXY virtual void GetPosition() const ! wxPoint GetPosition() const virtual wxRect GetRect() const *************** *** 154,170 **** virtual int GetScrollThumb(int orientation) virtual wxSize GetSize() const ! // %override [int width, int height] wxWindow::GetSize() const // virtual void GetSize(int* width, int* height) const ! %rename GetSizeWH virtual void GetSize(int* width, int* height) const wxSizer* GetSizer() const // %override [int x, int y, int descent, int externalLeading] int wxWindow::GetTextExtent(const wxString& string, const wxFont* font = NULL ) const // Note: Cannot use use16 from lua, virtual void GetTextExtent(const wxString& string, int* x, int* y, int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL, bool use16 = false) const ! virtual void GetTextExtent(const wxString& string, int* x, int* y, int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL ) const !%wxchkver_2_7 virtual wxString GetTitle() wxToolTip* GetToolTip() const virtual wxRegion GetUpdateRegion() const wxValidator* GetValidator() const ! // %override [int width, int height] wxWindow::GetVirtualSize() const - specify dummy width to get overload ! %override_name wxLua_wxWindow_GetVirtualSizeWH void GetVirtualSize(int width, int height=0) const // (int* width, int* height) const wxSize GetVirtualSize() const long GetWindowStyleFlag() const --- 163,187 ---- virtual int GetScrollThumb(int orientation) virtual wxSize GetSize() const ! ! // %override [int width, int height] wxWindow::GetSizeWH() const // virtual void GetSize(int* width, int* height) const ! %rename GetSizeWH virtual void GetSize() const ! wxSizer* GetSizer() const + // %override [int x, int y, int descent, int externalLeading] int wxWindow::GetTextExtent(const wxString& string, const wxFont* font = NULL ) const // Note: Cannot use use16 from lua, virtual void GetTextExtent(const wxString& string, int* x, int* y, int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL, bool use16 = false) const ! // virtual void GetTextExtent(const wxString& string, int* x, int* y, int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL ) const ! virtual void GetTextExtent(const wxString& string, const wxFont* font = NULL ) const ! !%wxchkver_2_7 virtual wxString GetTitle() wxToolTip* GetToolTip() const virtual wxRegion GetUpdateRegion() const wxValidator* GetValidator() const ! ! // %override [int width, int height] wxWindow::GetVirtualSizeWH() const ! // void GetVirtualSize(int* width, int* height) const ! %override_name wxLua_wxWindow_GetVirtualSizeWH %rename GetVirtualSizeWH void GetVirtualSize() const ! wxSize GetVirtualSize() const long GetWindowStyleFlag() const *************** *** 206,211 **** virtual bool Reparent(wxWindow* newParent) virtual wxPoint ScreenToClient(const wxPoint& pt) const ! // %override %rename [int x, int y] wxWindow::ScreenToClient(int x, int y) const ! %override_name wxLua_wxWindow_ScreenToClientXY virtual void ScreenToClient(int x, int y) const // (int* x, int* y) const virtual bool ScrollLines(int lines) virtual bool ScrollPages(int pages) --- 223,231 ---- virtual bool Reparent(wxWindow* newParent) virtual wxPoint ScreenToClient(const wxPoint& pt) const ! ! // %override [int x, int y] wxWindow::ScreenToClient(int x, int y) const ! // virtual void ScreenToClient(int* x, int* y) const ! %override_name wxLua_wxWindow_ScreenToClientXY virtual void ScreenToClient(int x, int y) const ! virtual bool ScrollLines(int lines) virtual bool ScrollPages(int pages) *************** *** 458,463 **** //int GetSelection() const wxColour GetThemeBackgroundColour() const // %override [int page, int flags] HitTest(const wxPoint& pt) ! int HitTest(const wxPoint& pt, long *flags = NULL) //bool InsertPage(int index, wxNotebookPage* page, const wxString& text, bool select = false, int imageId = -1) //bool RemovePage(int page) --- 478,486 ---- //int GetSelection() const wxColour GetThemeBackgroundColour() const + // %override [int page, int flags] HitTest(const wxPoint& pt) ! // int HitTest(const wxPoint& pt, long *flags = NULL) ! int HitTest(const wxPoint& pt) ! //bool InsertPage(int index, wxNotebookPage* page, const wxString& text, bool select = false, int imageId = -1) //bool RemovePage(int page) *************** *** 786,800 **** // %override [int xx, int yy] void CalcScrolledPosition(int x, int y) const ! void CalcScrolledPosition( int x, int y, int *xx, int *yy) const // %override [int xx, int yy] void CalcUnscrolledPosition(int x, int y) const ! void CalcUnscrolledPosition( int x, int y, int *xx, int *yy) const bool Create(wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHSCROLL | wxVSCROLL, const wxString& name = "wxScrolledWindow") void EnableScrolling(const bool xScrolling, const bool yScrolling) // %override [int xUnit, int yUnit] GetScrollPixelsPerUnit() const ! void GetScrollPixelsPerUnit(int* xUnit, int* yUnit) const // %override [int x, int y] GetViewStart() const ! void GetViewStart(int* x, int* y) const // %override [int x, int y] GetVirtualSize() const ! void GetVirtualSize(int* x, int* y) const bool IsRetained() const --- 809,832 ---- // %override [int xx, int yy] void CalcScrolledPosition(int x, int y) const ! // void CalcScrolledPosition( int x, int y, int *xx, int *yy) const ! void CalcScrolledPosition( int x, int y) const ! // %override [int xx, int yy] void CalcUnscrolledPosition(int x, int y) const ! // void CalcUnscrolledPosition( int x, int y, int *xx, int *yy) const ! void CalcUnscrolledPosition( int x, int y) const ! bool Create(wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHSCROLL | wxVSCROLL, const wxString& name = "wxScrolledWindow") void EnableScrolling(const bool xScrolling, const bool yScrolling) // %override [int xUnit, int yUnit] GetScrollPixelsPerUnit() const ! // void GetScrollPixelsPerUnit(int* xUnit, int* yUnit) const ! void GetScrollPixelsPerUnit() const ! // %override [int x, int y] GetViewStart() const ! // void GetViewStart(int* x, int* y) const ! void GetViewStart() const ! // %override [int x, int y] GetVirtualSize() const ! // void GetVirtualSize(int* x, int* y) const ! void GetVirtualSize() const bool IsRetained() const Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** gdi.i 31 May 2007 17:18:46 -0000 1.46 --- gdi.i 31 May 2007 21:38:39 -0000 1.47 *************** *** 22,27 **** --- 22,30 ---- // %override [int, x, int y] wxPoint::GetXY() + // wxLua added function int GetXY() const + // %override void wxPoint::Set(int x, int y) + // wxLua added function void Set(int x, int y) *************** *** 167,173 **** 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() bool Intersect(long x, long y, long width, long height) bool Intersect(const wxRect& rect) --- 170,178 ---- wxBitmap ConvertToBitmap() const wxRect GetBox() const ! ! // %override [int x, int y, int width, int height] wxRegion::GetBoxXYWH() ! // void GetBox(int &x, int &y, int &width, int &height) ! %rename GetBoxXYWH void GetBox() ! bool Intersect(long x, long y, long width, long height) bool Intersect(const wxRect& rect) *************** *** 202,207 **** --- 207,214 ---- bool HaveRects() void Reset() + // %override wxRegionIterator::Next() is ++ operator void Next() // operator++ + %endclass *************** *** 539,545 **** wxFontEncoding CharsetToEncoding(const wxString &charset, bool interactive = true) static wxFontMapper *Get() // %override [bool, wxFontEncoding *altEncoding] GetAltForEncoding(wxFontEncoding encoding, const wxString &faceName = "", bool interactive = true) ! bool GetAltForEncoding(wxFontEncoding encoding, wxFontEncoding *altEncoding, const wxString &faceName = "", bool interactive = true) // %rename GetAltForEncodingInternal bool GetAltForEncoding(wxFontEncoding encoding, wxNativeEncodingInfo *info, const wxString &faceName = "", bool interactive = true) static wxString GetDefaultConfigPath() static wxFontEncoding GetEncoding(size_t n) --- 546,557 ---- wxFontEncoding CharsetToEncoding(const wxString &charset, bool interactive = true) static wxFontMapper *Get() + // %override [bool, wxFontEncoding *altEncoding] GetAltForEncoding(wxFontEncoding encoding, const wxString &faceName = "", bool interactive = true) ! // bool GetAltForEncoding(wxFontEncoding encoding, wxFontEncoding *altEncoding, const wxString &faceName = "", bool interactive = true) ! bool GetAltForEncoding(wxFontEncoding encoding, const wxString &faceName = "", bool interactive = true) ! ! // This function is really for wxWidgets internal use // %rename GetAltForEncodingInternal bool GetAltForEncoding(wxFontEncoding encoding, wxNativeEncodingInfo *info, const wxString &faceName = "", bool interactive = true) + static wxString GetDefaultConfigPath() static wxFontEncoding GetEncoding(size_t n) *************** *** 929,939 **** wxBitmap() - %override_name wxLua_wxBitmapFromData_constructor %win wxBitmap(void * data, int type, int width, int height, int depth = -1) wxBitmap(const wxBitmap& bitmap) wxBitmap( int width, int height, int depth = -1) wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_ANY) // wxBitmap(const char **data) Load from XPM %override_name wxLua_wxBitmapFromXPMData_constructor wxBitmap(LuaTable charTable) ! wxBitmap(const wxImage &image, int depth = -1) //%win static void AddHandler(wxBitmapHandler* handler) --- 941,956 ---- wxBitmap() wxBitmap(const wxBitmap& bitmap) wxBitmap( int width, int height, int depth = -1) wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_ANY) + wxBitmap(const wxImage &image, int depth = -1) + + // %override wxBitmap(LuaTable stringTable where each index is a row in the image) // wxBitmap(const char **data) Load from XPM %override_name wxLua_wxBitmapFromXPMData_constructor wxBitmap(LuaTable charTable) ! ! // %override wxBitmap(lua string of data, int type, int width, int height, int depth = -1) ! // wxBitmap(const void* data, int type, int width, int height, int depth = -1) ! %override_name wxLua_wxBitmapFromData_constructor %win wxBitmap(const wxString& data, int type, int width, int height, int depth = -1) //%win static void AddHandler(wxBitmapHandler* handler) *************** *** 1092,1098 **** wxIcon GetIcon(int index) const 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() --- 1109,1117 ---- wxIcon GetIcon(int index) const 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() *************** *** 1262,1273 **** //void GetSizeMM(wxCoord *width, wxCoord *height) const // wxSize GetSizeMM() const const wxColour& GetTextBackground() const // %override [int x, int y, int descent, int externalLeading] int wxDC::GetTextExtent(const wxString& string, const wxFont* font = NULL ) // void GetTextExtent(const wxString& string, wxCoord* x, wxCoord* y, wxCoord* descent = NULL, wxCoord* externalLeading = NULL, const wxFont* font = NULL) ! void GetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, wxFont *font = NULL) %wxchkver_2_8 %rename GetTextExtentSize wxSize GetTextExtent(const wxString& string) const // %override [int x, int y, int heightLine] int wxDC::GetMultiLineTextExtent(const wxString& string, const wxFont* font = NULL ) // void GetMultiLineTextExtent(const wxString& string, wxCoord* x, wxCoord* y, wxCoord* heightLine = NULL, const wxFont* font = NULL) ! %wxchkver_2_8 void GetMultiLineTextExtent(const wxString& string, wxCoord *width, wxCoord *height, wxCoord *heightLine = NULL, wxFont *font = NULL) const %wxchkver_2_8 %rename GetMultiLineTextExtentSize wxSize GetMultiLineTextExtent(const wxString& string) const const wxColour& GetTextForeground() void GetUserScale(double *x, double *y) --- 1281,1297 ---- //void GetSizeMM(wxCoord *width, wxCoord *height) const // wxSize GetSizeMM() const const wxColour& GetTextBackground() const + // %override [int x, int y, int descent, int externalLeading] int wxDC::GetTextExtent(const wxString& string, const wxFont* font = NULL ) // void GetTextExtent(const wxString& string, wxCoord* x, wxCoord* y, wxCoord* descent = NULL, wxCoord* externalLeading = NULL, const wxFont* font = NULL) ! void GetTextExtent(const wxString& string, wxFont *font = NULL) ! %wxchkver_2_8 %rename GetTextExtentSize wxSize GetTextExtent(const wxString& string) const + // %override [int x, int y, int heightLine] int wxDC::GetMultiLineTextExtent(const wxString& string, const wxFont* font = NULL ) // void GetMultiLineTextExtent(const wxString& string, wxCoord* x, wxCoord* y, wxCoord* heightLine = NULL, const wxFont* font = NULL) ! %wxchkver_2_8 void GetMultiLineTextExtent(const wxString& string, wxFont *font = NULL) const ! %wxchkver_2_8 %rename GetMultiLineTextExtentSize wxSize GetMultiLineTextExtent(const wxString& string) const + const wxColour& GetTextForeground() void GetUserScale(double *x, double *y) *************** *** 1432,1442 **** 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() --- 1456,1470 ---- bool Create(wxWindow* window, int width, int height) static int GetBlinkTime() + // %override [int x, int y] wxCaret::GetPositionXY() ! // void GetPosition(int *x, int *y) %rename GetPositionXY void GetPosition() + wxPoint GetPosition() ! ! // %override [int x, int y] wxCaret::GetSizeWH() ! // void GetSize(int *x, int *y) %rename GetSizeWH void GetSize() + wxSize GetSize() wxWindow *GetWindow() *************** *** 1457,1461 **** %include "wx/caret.h" ! %class %delete %noclassinfo %encapsulate wxCaretSuspend // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough wxCaretSuspend(wxWindow *win = NULL) --- 1485,1489 ---- %include "wx/caret.h" ! %class %noclassinfo %encapsulate %delete wxCaretSuspend // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough wxCaretSuspend(wxWindow *win = NULL) *************** *** 1493,1498 **** %class wxGLCanvas, wxWindow ! // %override Note: attribList[] parameter is a lua table with integer indexes ! wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) wxGLCanvas(wxWindow* parent, wxGLContext* sharedContext, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) --- 1521,1529 ---- %class wxGLCanvas, wxWindow ! // %override wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", LuaTable intTable, const wxPalette& palette = wxNullPalette) ! // Note: attribList[] parameter is a lua table with integer indexes ! // wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) ! wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", LuaTable intTable, const wxPalette& palette = wxNullPalette) ! wxGLCanvas(wxWindow* parent, wxGLContext* sharedContext, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) Index: html.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** html.i 31 May 2007 17:18:46 -0000 1.17 --- html.i 31 May 2007 21:38:39 -0000 1.18 *************** *** 23,32 **** --- 23,42 ---- // %override [bool, int pagebreak] wxHtmlCell::AdjustPagebreak(int pagebreak) + + // %override bool AdjustPagebreak(int pagebreak) // int* known_pagebreaks, int number_of_pages) + // bool AdjustPagebreak(int pagebreak, int* known_pagebreaks, int number_of_pages) %not_overload !%wxchkver_2_7 virtual bool AdjustPagebreak(int pagebreak) // int* known_pagebreaks, int number_of_pages) + + // %override bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) + // bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) %not_overload %wxchkver_2_7 virtual bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) + //virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, wxHtmlRenderingInfo& info) //virtual void DrawInvisible(wxDC& dc, int x, int y, wxHtmlRenderingInfo& info) + // %override wxHtmlCell* Find(int condition, [none, string, or int]) + // virtual const wxHtmlCell* Find(int condition, void *param = 0) virtual const wxHtmlCell* Find(int condition, void *param = 0) + int GetDescent() const wxHtmlCell* GetFirstChild() *************** *** 83,90 **** wxString GetName() const wxString GetParam(const wxString& par, bool with_commas = false) const // %override [bool, wxColour] wxHtmlTag::GetParamAsColour(const wxString& par) const ! bool GetParamAsColour(const wxString& par, wxColour *clr) const // %override [bool, int value] wxHtmlTag::GetParamAsInt(const wxString& par) const ! bool GetParamAsInt(const wxString& par, int *value) const bool HasEnding() const bool HasParam(const wxString& par) const --- 93,105 ---- wxString GetName() const wxString GetParam(const wxString& par, bool with_commas = false) const + // %override [bool, wxColour] wxHtmlTag::GetParamAsColour(const wxString& par) const ! // bool GetParamAsColour(const wxString& par, wxColour *clr) const ! bool GetParamAsColour(const wxString& par) const ! // %override [bool, int value] wxHtmlTag::GetParamAsInt(const wxString& par) const ! // bool GetParamAsInt(const wxString& par, int *value) const ! bool GetParamAsInt(const wxString& par) const ! bool HasEnding() const bool HasParam(const wxString& par) const *************** *** 168,173 **** void SelectWord(const wxPoint& pos) void SetBorders(int b) ! // %override void SetFonts(wxString normal_face, wxString fixed_face, {lua int table}) ! void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) bool SetPage(const wxString& source) void SetRelatedFrame(wxFrame* frame, const wxString& format) --- 183,191 ---- void SelectWord(const wxPoint& pos) void SetBorders(int b) ! ! // %override void SetFonts(wxString normal_face, wxString fixed_face, lua int table) ! // void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) ! void SetFonts(wxString normal_face, wxString fixed_face, LuaTable intTable) ! bool SetPage(const wxString& source) void SetRelatedFrame(wxFrame* frame, const wxString& format) *************** *** 244,249 **** void SetFontSize(int s) void SetFontUnderlined(int x) ! // %override void SetFonts(wxString normal_face, wxString fixed_face, {lua int table}) ! void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) void SetLink(const wxHtmlLinkInfo& link) void SetLinkColor(const wxColour& clr) --- 262,270 ---- void SetFontSize(int s) void SetFontUnderlined(int x) ! ! // %override void SetFonts(wxString normal_face, wxString fixed_face, lua int table) ! // void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) ! void SetFonts(wxString normal_face, wxString fixed_face, LuaTable intTable) ! void SetLink(const wxHtmlLinkInfo& link) void SetLinkColor(const wxColour& clr) Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** datetime.i 31 May 2007 17:18:46 -0000 1.25 --- datetime.i 31 May 2007 21:38:39 -0000 1.26 *************** *** 138,148 **** wxDateTime() ! %constructor wxDateTimeFromTime(time_t dateTime) ! %constructor wxDateTimeFromJDN(double dateTime) ! %constructor wxDateTimeFromHMS(int hour, int minute, int second, int millisec) ! %constructor wxDateTimeFromDMY(int day, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year, int hour = 0, int minute = 0, int second = 0, int millisec = 0) wxDateTime& SetToCurrent() ! %rename SetToTime wxDateTime& Set(time_t time) %rename SetToJDN wxDateTime& Set(double dateTime) %rename SetToHMS wxDateTime& Set(int hour, int minute, int second, int millisec) --- 138,148 ---- wxDateTime() ! wxDateTime(time_t dateTime) // use with lua's os.time() on MSW, Linux, others? ! %rename wxDateTimeFromJDN wxDateTime(double dateTime) ! %rename wxDateTimeFromHMS wxDateTime(int hour, int minute, int second, int millisec) ! %rename wxDateTimeFromDMY wxDateTime(int day, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year, int hour = 0, int minute = 0, int second = 0, int millisec = 0) wxDateTime& SetToCurrent() ! wxDateTime& Set(time_t time) // use with lua's os.time() on MSW, Linux, others? %rename SetToJDN wxDateTime& Set(double dateTime) %rename SetToHMS wxDateTime& Set(int hour, int minute, int second, int millisec) *************** *** 426,432 **** --- 426,434 ---- void SetHoliday(size_t day) void ResetAttr(size_t day) + // %override [wxCalendarHitTestResult, wxDateTime date, wxDateTime::WeekDay wd] wxCalendarCtrl::HitTest(const wxPoint& pos) // wxCalendarHitTestResult HitTest(const wxPoint& pos, wxDateTime* date = NULL, wxDateTime::WeekDay* wd = NULL) wxCalendarHitTestResult HitTest(const wxPoint& pos) + %endclass *************** *** 515,518 **** --- 517,521 ---- // bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const bool GetRange() const + wxDateTime GetValue() const void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) Index: appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** appframe.i 31 May 2007 17:18:46 -0000 1.32 --- appframe.i 31 May 2007 21:38:38 -0000 1.33 *************** *** 129,133 **** // wxLogNull ! %class %delete %noclassinfo %encapsulate wxLogNull // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough wxLogNull() --- 129,133 ---- // wxLogNull ! %class %noclassinfo %encapsulate %delete wxLogNull // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough wxLogNull() *************** *** 288,294 **** void SetStatusBarPane(int n) virtual void SetStatusText(const wxString& text, int number = 0) // %override void wxFrame::SetStatusWidths(lua table with number indexes and values) ! //virtual void SetStatusWidths(int n, int *widths) virtual void SetStatusWidths(LuaTable intTable) void SetToolBar(wxToolBar* toolBar) %endclass --- 288,296 ---- void SetStatusBarPane(int n) virtual void SetStatusText(const wxString& text, int number = 0) + // %override void wxFrame::SetStatusWidths(lua table with number indexes and values) ! // virtual void SetStatusWidths(int n, int *widths) virtual void SetStatusWidths(LuaTable intTable) + void SetToolBar(wxToolBar* toolBar) %endclass *************** *** 336,350 **** void PopStatusText(int field = 0) void PushStatusText(const wxString& string, int field = 0) // %override void wxStatusBar::SetFieldsCount(either a single number or a lua table with number indexes and values) // virtual void SetFieldsCount(int number = 1, int* widths = NULL) virtual void SetFieldsCount(LuaTable intTable) void SetMinHeight(int height) virtual void SetStatusText(const wxString& text, int i = 0) // %override void wxStatusBar::SetStatusWidths(lua table with number indexes a... [truncated message content] |
