From: John L. <jr...@us...> - 2007-06-01 18:19:51
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2839/wxLua/bindings/wxwidgets Modified Files: appframe.i clipdrag.i config.i controls.i datetime.i dialogs.i event.i file.i gdi.i grid.i help.i html.i image.i mdi.i menutool.i print.i regex.i socket.i windows.i xml.i Log Message: Fix Makefiles to work for genwxbind.lua w/ cygwin in MSW Make all the %override comments in the bindings uniform and fix the parameters actually used for them. Index: config.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/config.i,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** config.i 31 May 2007 21:38:38 -0000 1.20 --- config.i 1 Jun 2007 18:19:46 -0000 1.21 *************** *** 59,75 **** // %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 --- 59,75 ---- // %override [bool, string, index] wxConfigBase::GetFirstGroup() ! // C++ Func: bool GetFirstGroup(wxString& str, long& index) const bool GetFirstGroup() const // %override [bool, string, index] wxConfigBase::GetFirstEntry() ! // C++ Func: bool GetFirstEntry(wxString& str, long& index) const bool GetFirstEntry() const // %override [bool, string, index] wxConfigBase::GetNextGroup(index) ! // C++ Func: bool GetNextGroup(wxString& str, long& index) const bool GetNextGroup() const // %override [bool, string, index] wxConfigBase::GetNextEntry(index) ! // C++ Func: bool GetNextEntry(wxString& str, long& index) const bool GetNextEntry(long index) const *************** *** 84,88 **** // %override [bool, string] 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 --- 84,88 ---- // %override [bool, string] wxConfigBase::Read(const wxString& key, const wxString& defaultVal = "") ! // C++ Func: bool Read(const wxString& key, wxString* str, const wxString& defaultVal) const bool Read(const wxString& key, const wxString& defaultVal = "") const *************** *** 90,101 **** // %override [bool, double] wxConfigBase::Read(const wxString& key, double defaultVal = 0) ! // bool Read(const wxString& key, double* d, double defaultVal = 0) const %override_name wxLua_wxConfigBase_ReadFloat bool Read(const wxString& key, double defaultVal) const // // %override [bool, int] wxConfigBase::ReadInt(const wxString& key, long defaultVal = 0) ! // // bool Read(const wxString& key, long* l, long defaultVal = 0) const // %rename ReadInt bool Read(const wxString& key, long defaultVal = 0) const // // %override [bool, double] wxConfigBase::ReadFloat(const wxString& key, double defaultVal = 0) ! // // bool Read(const wxString& key, double* d, double defaultVal = 0) const // %rename ReadFloat bool Read(const wxString& key, double defaultVal = 0) const --- 90,101 ---- // %override [bool, double] wxConfigBase::Read(const wxString& key, double defaultVal = 0) ! // C++ Func: bool Read(const wxString& key, double* d, double defaultVal = 0) const %override_name wxLua_wxConfigBase_ReadFloat bool Read(const wxString& key, double defaultVal) const // // %override [bool, int] wxConfigBase::ReadInt(const wxString& key, long defaultVal = 0) ! // // C++ Func: bool Read(const wxString& key, long* l, long defaultVal = 0) const // %rename ReadInt bool Read(const wxString& key, long defaultVal = 0) const // // %override [bool, double] wxConfigBase::ReadFloat(const wxString& key, double defaultVal = 0) ! // // C++ Func: bool Read(const wxString& key, double* d, double defaultVal = 0) const // %rename ReadFloat bool Read(const wxString& key, double defaultVal = 0) const Index: appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** appframe.i 31 May 2007 21:38:38 -0000 1.33 --- appframe.i 1 Jun 2007 18:19:46 -0000 1.34 *************** *** 290,294 **** // %override void wxFrame::SetStatusWidths(lua table with number indexes and values) ! // virtual void SetStatusWidths(int n, int *widths) virtual void SetStatusWidths(LuaTable intTable) --- 290,294 ---- // %override void wxFrame::SetStatusWidths(lua table with number indexes and values) ! // C++ Func: virtual void SetStatusWidths(int n, int *widths) virtual void SetStatusWidths(LuaTable intTable) *************** *** 340,344 **** // %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) --- 340,344 ---- // %override void wxStatusBar::SetFieldsCount(either a single number or a lua table with number indexes and values) ! // C++ Func: virtual void SetFieldsCount(int number = 1, int* widths = NULL) virtual void SetFieldsCount(LuaTable intTable) *************** *** 347,355 **** // %override void wxStatusBar::SetStatusWidths(lua table with number indexes and values) ! // virtual void SetStatusWidths(int n, int *widths) virtual void SetStatusWidths(LuaTable intTable) // %override void wxStatusBar::SetStatusStyles(lua table with number indexes and values) ! // virtual void SetStatusStyles(int n, int *styles) virtual void SetStatusStyles(LuaTable intTable) --- 347,355 ---- // %override void wxStatusBar::SetStatusWidths(lua table with number indexes and values) ! // C++ Func: virtual void SetStatusWidths(int n, int *widths) virtual void SetStatusWidths(LuaTable intTable) // %override void wxStatusBar::SetStatusStyles(lua table with number indexes and values) ! // C++ Func: virtual void SetStatusStyles(int n, int *styles) virtual void SetStatusStyles(LuaTable intTable) *************** *** 390,394 **** // { { wx.wxACCEL_NORMAL, string.byte('0'), ID_0 }, // { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD0, ID_0 } } ! //wxAcceleratorTable(int n, wxAcceleratorEntry* entries) wxAcceleratorTable(LuaTable accelTable) --- 390,394 ---- // { { wx.wxACCEL_NORMAL, string.byte('0'), ID_0 }, // { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD0, ID_0 } } ! // C++ Func: wxAcceleratorTable(int n, wxAcceleratorEntry* entries) wxAcceleratorTable(LuaTable accelTable) Index: print.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** print.i 31 May 2007 21:38:40 -0000 1.16 --- print.i 1 Jun 2007 18:19:46 -0000 1.17 *************** *** 24,44 **** // %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() --- 24,44 ---- // %override [int minPage, int maxPage, int pageFrom, int pageTo] wxPrintout::GetPageInfo() ! // C++ Func: void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) void GetPageInfo() // %override [int w, int h] wxPrintout::GetPageSizeMM() ! // C++ Func: void GetPageSizeMM(int *w, int *h) void GetPageSizeMM() // %override [int w, int h] wxPrintout::GetPageSizePixels() ! // C++ Func: void GetPageSizePixels(int *w, int *h) void GetPageSizePixels() // %override [int w, int h] wxPrintout::GetPPIPrinter() ! // C++ Func: void GetPPIPrinter(int *w, int *h) void GetPPIPrinter() // %override [int w, int h] wxPrintout::GetPPIScreen() ! // C++ Func: void GetPPIScreen(int *w, int *h) void GetPPIScreen() Index: mdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/mdi.i,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** mdi.i 31 May 2007 21:38:39 -0000 1.13 --- mdi.i 1 Jun 2007 18:19:46 -0000 1.14 *************** *** 106,110 **** // %override [bool, string buf] wxDocManager::MakeDefaultName(wxString& buf) ! // bool MakeDefaultName(wxString& buf) bool MakeDefaultName(wxString& buf) --- 106,110 ---- // %override [bool, string buf] wxDocManager::MakeDefaultName(wxString& buf) ! // C++ Func: bool MakeDefaultName(wxString& buf) bool MakeDefaultName(wxString& buf) *************** *** 210,214 **** // %override [string name] wxDocument::GetPrintableName(wxString& name) const ! // virtual void GetPrintableName(wxString& name) const virtual void GetPrintableName(wxString& name) const --- 210,214 ---- // %override [string name] wxDocument::GetPrintableName(wxString& name) const ! // C++ Func: virtual void GetPrintableName(wxString& name) const virtual void GetPrintableName(wxString& name) const Index: image.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/image.i,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** image.i 31 May 2007 21:38:39 -0000 1.25 --- image.i 1 Jun 2007 18:19:46 -0000 1.26 *************** *** 90,94 **** // %override wxImage(int width, int height, unsigned char* data, bool static_data = false) ! // wxImage(int width, int height, unsigned char* data, bool static_data = false) %override_name wxLua_wxImageFromData_constructor wxImage(int width, int height, unsigned char* data, bool static_data = false) --- 90,94 ---- // %override wxImage(int width, int height, unsigned char* data, bool static_data = false) ! // C++ Func: wxImage(int width, int height, unsigned char* data, bool static_data = false) %override_name wxLua_wxImageFromData_constructor wxImage(int width, int height, unsigned char* data, bool static_data = false) *************** *** 110,114 **** // %override [bool, uchar r, uchar g, char b] FindFirstUnusedColour(unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0) ! // bool FindFirstUnusedColour(unsigned char* r, unsigned char* g, unsigned char* b, unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0) bool FindFirstUnusedColour(unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0) --- 110,114 ---- // %override [bool, uchar r, uchar g, char b] FindFirstUnusedColour(unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0) ! // C++ Func: bool FindFirstUnusedColour(unsigned char* r, unsigned char* g, unsigned char* b, unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0) bool FindFirstUnusedColour(unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0) *************** *** 131,135 **** // %override [bool, uchar r, uchar g, uchar b] GetOrFindMaskColour() const ! // bool GetOrFindMaskColour(unsigned char *r, unsigned char *g, unsigned char *b) const bool GetOrFindMaskColour() const --- 131,135 ---- // %override [bool, uchar r, uchar g, uchar b] GetOrFindMaskColour() const ! // C++ Func: bool GetOrFindMaskColour(unsigned char *r, unsigned char *g, unsigned char *b) const bool GetOrFindMaskColour() const *************** *** 141,149 **** // note: we're tricking generator to not gag on RGB/HSVValue, so pretend to return an int // %override [r, g, b] HSVtoRGB(double h, double s, double v) ! // static RGBValue HSVtoRGB(const HSVValue& hsv) static int HSVtoRGB(double h, double s, double v) // %override [h, s, v] RGBtoHSV(unsigned char r, unsigned char g, unsigned char b) ! // static HSVValue RGBtoHSV(const RGBValue& rgb) static int RGBtoHSV(unsigned char r, unsigned char g, unsigned char b) --- 141,149 ---- // note: we're tricking generator to not gag on RGB/HSVValue, so pretend to return an int // %override [r, g, b] HSVtoRGB(double h, double s, double v) ! // C++ Func: static RGBValue HSVtoRGB(const HSVValue& hsv) static int HSVtoRGB(double h, double s, double v) // %override [h, s, v] RGBtoHSV(unsigned char r, unsigned char g, unsigned char b) ! // C++ Func: static HSVValue RGBtoHSV(const RGBValue& rgb) static int RGBtoHSV(unsigned char r, unsigned char g, unsigned char b) *************** *** 181,189 **** // %override void wxImage::SetAlpha(lua string) - copy contents of string to image ! // void SetAlpha(unsigned char *alpha = NULL,bool static_data = false) %override_name wxLua_wxImage_SetAlphaData void SetAlpha(const wxString& dataStr) // %override void SetData(lua string) - copy contents of string to image ! // void SetData(unsigned char *data) void SetData(const wxString& data) --- 181,189 ---- // %override void wxImage::SetAlpha(lua string) - copy contents of string to image ! // C++ Func: void SetAlpha(unsigned char *alpha = NULL,bool static_data = false) %override_name wxLua_wxImage_SetAlphaData void SetAlpha(const wxString& dataStr) // %override void SetData(lua string) - copy contents of string to image ! // C++ Func: void SetData(unsigned char *data) void SetData(const wxString& data) Index: help.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/help.i,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** help.i 31 May 2007 21:38:39 -0000 1.14 --- help.i 1 Jun 2007 18:19:46 -0000 1.15 *************** *** 111,115 **** // %override [wxFrame*, wxSize* size = NULL, wxPoint* pos = NULL, bool *newFrameEachTime = NULL] wxHelpController::GetFrameParameters() ! // virtual wxFrame* GetFrameParameters(wxSize* size = NULL, wxPoint* pos = NULL, bool *newFrameEachTime = NULL) virtual wxFrame* GetFrameParameters() --- 111,115 ---- // %override [wxFrame*, wxSize* size = NULL, wxPoint* pos = NULL, bool *newFrameEachTime = NULL] wxHelpController::GetFrameParameters() ! // C++ Func: virtual wxFrame* GetFrameParameters(wxSize* size = NULL, wxPoint* pos = NULL, bool *newFrameEachTime = NULL) virtual wxFrame* GetFrameParameters() Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** windows.i 31 May 2007 21:38:40 -0000 1.35 --- windows.i 1 Jun 2007 18:19:46 -0000 1.36 *************** *** 89,93 **** // %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 --- 89,93 ---- // %override [int x, int y] ClientToScreen(int x, int y) const ! // C++ Func: virtual void ClientToScreen(int* x, int* y) const %override_name wxLua_wxWindow_ClientToScreenXY virtual void ClientToScreen(int x, int y) const *************** *** 129,133 **** // %override [int width, int height] wxWindow::GetClientSizeWH() const ! // virtual void GetClientSize(int* width, int* height) const %rename GetClientSizeWH virtual void GetClientSize() const --- 129,133 ---- // %override [int width, int height] wxWindow::GetClientSizeWH() const ! // C++ Func: virtual void GetClientSize(int* width, int* height) const %rename GetClientSizeWH virtual void GetClientSize() const *************** *** 154,158 **** // %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 --- 154,158 ---- // %override [int x, int y] GetPosition(int x, int y) const ! // C++ Func: virtual void GetPosition(int* x, int* y) const %override_name wxLua_wxWindow_GetPositionXY %rename GetPositionXY virtual void GetPosition() const *************** *** 165,169 **** // %override [int width, int height] wxWindow::GetSizeWH() const ! // virtual void GetSize(int* width, int* height) const %rename GetSizeWH virtual void GetSize() const --- 165,169 ---- // %override [int width, int height] wxWindow::GetSizeWH() const ! // C++ Func: virtual void GetSize(int* width, int* height) const %rename GetSizeWH virtual void GetSize() const *************** *** 172,176 **** // %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 --- 172,176 ---- // %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 ! // C++ Func: 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 *************** *** 181,185 **** // %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 --- 181,185 ---- // %override [int width, int height] wxWindow::GetVirtualSizeWH() const ! // C++ Func: void GetVirtualSize(int* width, int* height) const %override_name wxLua_wxWindow_GetVirtualSizeWH %rename GetVirtualSizeWH void GetVirtualSize() const *************** *** 225,229 **** // %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 --- 225,229 ---- // %override [int x, int y] wxWindow::ScreenToClient(int x, int y) const ! // C++ Func: virtual void ScreenToClient(int* x, int* y) const %override_name wxLua_wxWindow_ScreenToClientXY virtual void ScreenToClient(int x, int y) const *************** *** 480,484 **** // %override [int page, int flags] HitTest(const wxPoint& pt) ! // int HitTest(const wxPoint& pt, long *flags = NULL) int HitTest(const wxPoint& pt) --- 480,484 ---- // %override [int page, int flags] HitTest(const wxPoint& pt) ! // C++ Func: int HitTest(const wxPoint& pt, long *flags = NULL) int HitTest(const wxPoint& pt) *************** *** 809,817 **** // %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 --- 809,817 ---- // %override [int xx, int yy] void CalcScrolledPosition(int x, int y) const ! // C++ Func: 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 ! // C++ Func: void CalcUnscrolledPosition( int x, int y, int *xx, int *yy) const void CalcUnscrolledPosition( int x, int y) const *************** *** 819,831 **** 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 --- 819,831 ---- void EnableScrolling(const bool xScrolling, const bool yScrolling) // %override [int xUnit, int yUnit] GetScrollPixelsPerUnit() const ! // C++ Func: void GetScrollPixelsPerUnit(int* xUnit, int* yUnit) const void GetScrollPixelsPerUnit() const // %override [int x, int y] GetViewStart() const ! // C++ Func: void GetViewStart(int* x, int* y) const void GetViewStart() const // %override [int x, int y] GetVirtualSize() const ! // C++ Func: void GetVirtualSize(int* x, int* y) const void GetVirtualSize() const Index: file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** file.i 31 May 2007 21:38:39 -0000 1.22 --- file.i 1 Jun 2007 18:19:46 -0000 1.23 *************** *** 179,183 **** // %override [lua string table] wxFileName::GetDirs() ! // const wxArrayString& GetDirs() const const wxArrayString& GetDirs() const --- 179,183 ---- // %override [lua string table] wxFileName::GetDirs() ! // C++ Func: const wxArrayString& GetDirs() const const wxArrayString& GetDirs() const *************** *** 203,207 **** // %override [bool, wxDateTime dtAccess, wxDateTime dtMod, wxDateTime dtCreate] wxFileName::GetTimes() ! // bool GetTimes(wxDateTime* dtAccess, wxDateTime* dtMod, wxDateTime* dtCreate) const bool GetTimes() const --- 203,207 ---- // %override [bool, wxDateTime dtAccess, wxDateTime dtMod, wxDateTime dtCreate] wxFileName::GetTimes() ! // C++ Func: bool GetTimes(wxDateTime* dtAccess, wxDateTime* dtMod, wxDateTime* dtCreate) const bool GetTimes() const *************** *** 250,262 **** // %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) --- 250,262 ---- // %override [wxString path, wxString name, wxString ext] wxFileName::SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! // C++ Func: 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) ! // C++ Func: 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) ! // C++ Func: static void SplitVolume(const wxString& fullpath, wxString* volume, wxString* path, wxPathFormat format = wxPATH_NATIVE) static void SplitVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) *************** *** 335,339 **** // %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) --- 335,339 ---- // %override [size_t count, lua string] wxFile::Read(unsigned int count) ! // C++ Func: size_t Read(void* buffer, unsigned int count) size_t Read(unsigned int count) *************** *** 343,347 **** // %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) --- 343,347 ---- // %override size_t wxFile::Write(lua string, unsigned int count) ! // C++ Func: size_t Write(const void* buffer, unsigned int count) size_t Write(const wxString& buffer, unsigned int count) *************** *** 404,412 **** // %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 --- 404,412 ---- // %override [unsigned int, lua string table] wxDir::GetAllFiles(const wxString& dirname, const wxString& filespec = "", int flags = wxDIR_DEFAULT) ! // C++ Func: 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) ! // C++ Func: bool GetFirst(wxString * filename, const wxString& filespec = "", int flags = wxDIR_DEFAULT) const bool GetFirst(const wxString& filespec = "", int flags = wxDIR_DEFAULT) const *************** *** 414,418 **** // %override [bool, string filename] wxDir::GetNext() ! // bool GetNext(wxString * filename) const bool GetNext() const --- 414,418 ---- // %override [bool, string filename] wxDir::GetNext() ! // C++ Func: bool GetNext(wxString * filename) const bool GetNext() const *************** *** 480,484 **** // %override [lua string] wxInputStream::Read(size_t size) ! // wxInputStream& Read(void *buffer, size_t size) wxString Read(size_t size) --- 480,484 ---- // %override [lua string] wxInputStream::Read(size_t size) ! // C++ Func: wxInputStream& Read(void *buffer, size_t size) wxString Read(size_t size) *************** *** 488,492 **** // %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) --- 488,492 ---- // %override size_t wxInputStream::Ungetch(lua string, size_t size) ! // C++ Func: size_t Ungetch(const char* buffer, size_t size) %override_name wxLua_wxInputStream_UngetchString size_t Ungetch(const wxString& str, size_t size) *************** *** 507,511 **** // %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) --- 507,511 ---- // %override wxOutputStream& wxOutputStream::Write(lua string, size_t size) ! // C++ Func: wxOutputStream& Write(const void *buffer, size_t size) wxOutputStream& Write(const wxString& buffer, size_t size) Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** gdi.i 31 May 2007 21:38:39 -0000 1.47 --- gdi.i 1 Jun 2007 18:19:46 -0000 1.48 *************** *** 172,176 **** // %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() --- 172,176 ---- // %override [int x, int y, int width, int height] wxRegion::GetBoxXYWH() ! // C++ Func: void GetBox(int &x, int &y, int &width, int &height) %rename GetBoxXYWH void GetBox() *************** *** 209,212 **** --- 209,213 ---- // %override wxRegionIterator::Next() is ++ operator + // This is a wxLua added function. void Next() // operator++ *************** *** 548,552 **** // %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) --- 549,553 ---- // %override [bool, wxFontEncoding *altEncoding] GetAltForEncoding(wxFontEncoding encoding, const wxString &faceName = "", bool interactive = true) ! // C++ Func: bool GetAltForEncoding(wxFontEncoding encoding, wxFontEncoding *altEncoding, const wxString &faceName = "", bool interactive = true) bool GetAltForEncoding(wxFontEncoding encoding, const wxString &faceName = "", bool interactive = true) *************** *** 947,955 **** // %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) --- 948,956 ---- // %override wxBitmap(LuaTable stringTable where each index is a row in the image) ! // C++ Func: 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) ! // C++ Func: 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) *************** *** 1111,1115 **** // %override [int width, int height] wxImageList::GetSize(int index) ! // void GetSize(int index, int& width, int& height) void GetSize(int index) --- 1112,1116 ---- // %override [int width, int height] wxImageList::GetSize(int index) ! // C++ Func: void GetSize(int index, int& width, int& height) void GetSize(int index) *************** *** 1283,1287 **** // %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) --- 1284,1288 ---- // %override [int x, int y, int descent, int externalLeading] int wxDC::GetTextExtent(const wxString& string, const wxFont* font = NULL ) ! // C++ Func: 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) *************** *** 1289,1293 **** // %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 --- 1290,1294 ---- // %override [int x, int y, int heightLine] int wxDC::GetMultiLineTextExtent(const wxString& string, const wxFont* font = NULL ) ! // C++ Func: 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 *************** *** 1458,1462 **** // %override [int x, int y] wxCaret::GetPositionXY() ! // void GetPosition(int *x, int *y) %rename GetPositionXY void GetPosition() --- 1459,1463 ---- // %override [int x, int y] wxCaret::GetPositionXY() ! // C++ Func: void GetPosition(int *x, int *y) %rename GetPositionXY void GetPosition() *************** *** 1464,1468 **** // %override [int x, int y] wxCaret::GetSizeWH() ! // void GetSize(int *x, int *y) %rename GetSizeWH void GetSize() --- 1465,1469 ---- // %override [int x, int y] wxCaret::GetSizeWH() ! // C++ Func: void GetSize(int *x, int *y) %rename GetSizeWH void GetSize() *************** *** 1523,1527 **** // %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) --- 1524,1528 ---- // %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 ! // C++ Func: 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) Index: regex.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/regex.i,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** regex.i 31 May 2007 21:38:40 -0000 1.8 --- regex.i 1 Jun 2007 18:19:46 -0000 1.9 *************** *** 38,42 **** // %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 --- 38,42 ---- // %override [bool, size_t start, size_t len] wxRegEx::GetMatch(size_t index = 0) const ! // C++ Func: 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 *************** *** 46,58 **** // %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 --- 46,58 ---- // %override [int, string text] Replace(const wxString& text, const wxString& replacement, size_t maxMatches = 0) const ! // C++ Func: 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 ! // C++ Func: 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 ! // C++ Func: int ReplaceFirst(wxString* text, const wxString& replacement) const int ReplaceFirst(const wxString& text, const wxString& replacement) const Index: menutool.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** menutool.i 31 May 2007 21:38:39 -0000 1.16 --- menutool.i 1 Jun 2007 18:19:46 -0000 1.17 *************** *** 30,33 **** --- 30,34 ---- // %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 + // wxLua provides this function %override_name wxLua_wxCreateMenu_constructor wxMenu(LuaTable luatable, const wxString& title = "", long style = 0) *************** *** 48,52 **** // %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 --- 49,53 ---- // %override [wxMenuItem* menuItem, wxMenu* ownerMenu] wxMenu::FindItem(int id) ! // C++ Func: wxMenuItem* FindItem(int id, wxMenu **menu = NULL) const %override_name wxLua_wxMenu_FindItemById wxMenuItem* FindItem(int id) const Index: clipdrag.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** clipdrag.i 31 May 2007 21:38:38 -0000 1.25 --- clipdrag.i 1 Jun 2007 18:19:46 -0000 1.26 *************** *** 116,124 **** // %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 --- 116,124 ---- // %override [lua table of wxDataFormat objects] wxDataObject::GetAllFormats(wxDataObject::Direction dir = wxDataObject) ! // C++ Func: 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) ! // C++ Func: virtual bool GetDataHere(const wxDataFormat& format, void *buf) const virtual bool GetDataHere(const wxDataFormat& format) const *************** *** 128,132 **** // %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) --- 128,132 ---- // %override bool wxDataObject::SetData(const wxDataFormat& format, lua string) ! // C++ Func: virtual bool SetData(const wxDataFormat& format, int len, const void *buf) virtual bool SetData(const wxDataFormat& format, const wxString& str) *************** *** 144,152 **** // %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) --- 144,152 ---- // %override [bool, lua string] wxDataObjectSimple::GetDataHere() ! // C++ Func: virtual bool GetDataHere(void *buf) const virtual bool GetDataHere() const // %override bool wxDataObjectSimple::SetData(lua string) ! // C++ Func: virtual bool SetData(size_t len, const void *buf) virtual bool SetData(const wxString& str) *************** *** 308,312 **** // %override [lua table of strings] wxDropFilesEvent::GetFiles() ! // wxString* GetFiles() const wxString* GetFiles() const --- 308,312 ---- // %override [lua table of strings] wxDropFilesEvent::GetFiles() ! // C++ Func: wxString* GetFiles() const wxString* GetFiles() const Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** datetime.i 31 May 2007 21:38:39 -0000 1.26 --- datetime.i 1 Jun 2007 18:19:46 -0000 1.27 *************** *** 428,432 **** // %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) --- 428,432 ---- // %override [wxCalendarHitTestResult, wxDateTime date, wxDateTime::WeekDay wd] wxCalendarCtrl::HitTest(const wxPoint& pos) ! // C++ Func: wxCalendarHitTestResult HitTest(const wxPoint& pos, wxDateTime* date = NULL, wxDateTime::WeekDay* wd = NULL) wxCalendarHitTestResult HitTest(const wxPoint& pos) *************** *** 515,519 **** // %override [bool, wxDateTime dt1, wxDateTime dt2] wxDatePickerCtrl::GetRange() const ! // bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const bool GetRange() const --- 515,519 ---- // %override [bool, wxDateTime dt1, wxDateTime dt2] wxDatePickerCtrl::GetRange() const ! // C++ Func: bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const bool GetRange() const Index: socket.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/socket.i,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** socket.i 31 May 2007 21:38:40 -0000 1.12 --- socket.i 1 Jun 2007 18:19:46 -0000 1.13 *************** *** 86,102 **** // %override [lua string] wxSocketBase::Peek(unsigned long nbytes) ! // void Peek(void * buffer, unsigned long nbytes) void Peek(unsigned long nbytes) // %override [lua string] wxSocketBase::Read(unsigned long nbytes) ! // void Read(unsigned long nbytes) void Read(void * buffer, unsigned long nbytes) // %override [lua string] wxSocketBase::ReadMsg(unsigned long nbytes) ! // void ReadMsg(void * buffer, unsigned long nbytes) void ReadMsg(unsigned long nbytes) // %override void wxSocketBase::Unread(lua string, [optional unsigned long nbytes]) ! // void Unread(const void * buffer, unsigned long nbytes) void Unread(const char* buffer, unsigned long nbytes) --- 86,102 ---- // %override [lua string] wxSocketBase::Peek(unsigned long nbytes) ! // C++ Func: void Peek(void * buffer, unsigned long nbytes) void Peek(unsigned long nbytes) // %override [lua string] wxSocketBase::Read(unsigned long nbytes) ! // C++ Func: void Read(unsigned long nbytes) void Read(void * buffer, unsigned long nbytes) // %override [lua string] wxSocketBase::ReadMsg(unsigned long nbytes) ! // C++ Func: void ReadMsg(void * buffer, unsigned long nbytes) void ReadMsg(unsigned long nbytes) // %override void wxSocketBase::Unread(lua string, [optional unsigned long nbytes]) ! // C++ Func: void Unread(const void * buffer, unsigned long nbytes) void Unread(const char* buffer, unsigned long nbytes) *************** *** 107,115 **** // %override void wxSocketBase::Write(lua string, [optional unsigned long nbytes]) ! // void Write(const void * buffer, unsigned long nbytes) void Write(const char* buffer, unsigned long nbytes) // %override void wxSocketBase::WriteMsg(lua string, [optional unsigned long nbytes]) ! // void WriteMsg(const void * buffer, wxUint32 nbytes) void WriteMsg(const char* buffer, wxUint32 nbytes) --- 107,115 ---- // %override void wxSocketBase::Write(lua string, [optional unsigned long nbytes]) ! // C++ Func: void Write(const void * buffer, unsigned long nbytes) void Write(const char* buffer, unsigned long nbytes) // %override void wxSocketBase::WriteMsg(lua string, [optional unsigned long nbytes]) ! // C++ Func: void WriteMsg(const void * buffer, wxUint32 nbytes) void WriteMsg(const char* buffer, wxUint32 nbytes) Index: html.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** html.i 31 May 2007 21:38:39 -0000 1.18 --- html.i 1 Jun 2007 18:19:46 -0000 1.19 *************** *** 25,33 **** // %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) --- 25,33 ---- // %override bool AdjustPagebreak(int pagebreak) // int* known_pagebreaks, int number_of_pages) ! // C++ Func: 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) ! // C++ Func: bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) %not_overload %wxchkver_2_7 virtual bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) *************** *** 36,40 **** // %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) --- 36,40 ---- // %override wxHtmlCell* Find(int condition, [none, string, or int]) ! // C++ Func: virtual const wxHtmlCell* Find(int condition, void *param = 0) virtual const wxHtmlCell* Find(int condition, void *param = 0) *************** *** 95,103 **** // %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 --- 95,103 ---- // %override [bool, wxColour] wxHtmlTag::GetParamAsColour(const wxString& par) const ! // C++ Func: bool GetParamAsColour(const wxString& par, wxColour *clr) const bool GetParamAsColour(const wxString& par) const // %override [bool, int value] wxHtmlTag::GetParamAsInt(const wxString& par) const ! // C++ Func: bool GetParamAsInt(const wxString& par, int *value) const bool GetParamAsInt(const wxString& par) const *************** *** 185,189 **** // %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) --- 185,189 ---- // %override void SetFonts(wxString normal_face, wxString fixed_face, lua int table) ! // C++ Func: void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) void SetFonts(wxString normal_face, wxString fixed_face, LuaTable intTable) *************** *** 264,268 **** // %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) --- 264,268 ---- // %override void SetFonts(wxString normal_face, wxString fixed_face, lua int table) ! // C++ Func: void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) void SetFonts(wxString normal_face, wxString fixed_face, LuaTable intTable) Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** controls.i 31 May 2007 21:38:38 -0000 1.35 --- controls.i 1 Jun 2007 18:19:46 -0000 1.36 *************** *** 136,140 **** //void* GetClientData(unsigned int n) const wxClientData* GetClientObject(unsigned int n) const ! %rename GetStringClientObject wxStringClientData* GetClientObject(int n) const int GetCount() const int GetSelection() const --- 136,140 ---- //void* GetClientData(unsigned int n) const wxClientData* GetClientObject(unsigned int n) const ! %rename GetStringClientObject wxStringClientData* GetClientObject(unsigned int n) const int GetCount() const int GetSelection() const *************** *** 271,275 **** // %override [lua table of int selections] wxListBox::GetSelections() ! // int GetSelections(wxArrayInt& selections) const int GetSelections() const --- 271,275 ---- // %override [lua table of int selections] wxListBox::GetSelections() ! // C++ Func: int GetSelections(wxArrayInt& selections) const int GetSelections() const *************** *** 415,419 **** // %override [long, int flags] wxListCtrl::HitTest(const wxPoint& point) ! // long HitTest(const wxPoint& point, int& flags) long HitTest(const wxPoint& point) --- 415,419 ---- // %override [long, int flags] wxListCtrl::HitTest(const wxPoint& point) ! // C++ Func: long HitTest(const wxPoint& point, int& flags) long HitTest(const wxPoint& point) *************** *** 848,852 **** // %override [long from, long to] wxTextCtrl::GetSelection() ! // virtual void GetSelection(long* from, long* to) const virtual void GetSelection() const --- 848,852 ---- // %override [long from, long to] wxTextCtrl::GetSelection() ! // C++ Func: virtual void GetSelection(long* from, long* to) const virtual void GetSelection() const *************** *** 856,864 **** // %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) ! // wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const %rename HitTestPos wxTextCtrlHitTestResult HitTest(const wxPoint& pt) const --- 856,864 ---- // %override [wxTextCtrlHitTestResult, int col, int row] wxTextCtrl::HitTest(const wxPoint& pt) ! // C++ Func: 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) ! // C++ Func: wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const %rename HitTestPos wxTextCtrlHitTestResult HitTest(const wxPoint& pt) const *************** *** 873,877 **** // %override [bool, int x, int y] wxTextCtrl::PositionToXY(pos) ! // bool PositionToXY(long pos, long *x, long *y) const bool PositionToXY(long pos) const --- 873,877 ---- // %override [bool, int x, int y] wxTextCtrl::PositionToXY(pos) ! // C++ Func: bool PositionToXY(long pos, long *x, long *y) const bool PositionToXY(long pos) const *************** *** 1024,1028 **** // %override [wxTreeItemId, wxTreeItemIdValue cookie] wxTreeCtrl::GetFirstChild(const wxTreeItemId& item) ! // wxTreeItemId GetFirstChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const wxTreeItemId GetFirstChild(const wxTreeItemId& item) const --- 1024,1028 ---- // %override [wxTreeItemId, wxTreeItemIdValue cookie] wxTreeCtrl::GetFirstChild(const wxTreeItemId& item) ! // C++ Func: wxTreeItemId GetFirstChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const wxTreeItemId GetFirstChild(const wxTreeItemId& item) const *************** *** 1039,1043 **** // %override [wxTreeItemId, wxTreeItemIdValue cookie] wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long cookie) ! // wxTreeItemId GetNextChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const wxTreeItemId GetNextChild(const wxTreeItemId& item, long cookie) const --- 1039,1043 ---- // %override [wxTreeItemId, wxTreeItemIdValue cookie] wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long cookie) ! // C++ Func: wxTreeItemId GetNextChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const wxTreeItemId GetNextChild(const wxTreeItemId& item, long cookie) const *************** *** 1052,1056 **** // %override [size_t, lua table of wxTreeItemIds] wxTreeCtrl::GetSelections() ! // size_t GetSelections(wxArrayTreeItemIds& selection) const size_t GetSelections() const --- 1052,1056 ---- // %override [size_t, lua table of wxTreeItemIds] wxTreeCtrl::GetSelections() ! // C++ Func: size_t GetSelections(wxArrayTreeItemIds& selection) const size_t GetSelections() const *************** *** 1058,1062 **** // %override [wxTreeItemId, int flags] wxTreeCtrl::HitTest(const wxPoint& point) ! // wxTreeItemId HitTest(const wxPoint& point, int& flags) wxTreeItemId HitTest(const wxPoint& point) --- 1058,1062 ---- // %override [wxTreeItemId, int flags] wxTreeCtrl::HitTest(const wxPoint& point) ! // C++ Func: wxTreeItemId HitTest(const wxPoint& point, int& flags) wxTreeItemId HitTest(const wxPoint& point) Index: xml.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/xml.i,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** xml.i 31 May 2007 21:38:40 -0000 1.10 --- xml.i 1 Jun 2007 18:19:46 -0000 1.11 *************** *** 51,55 **** // %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 --- 51,55 ---- // %override [bool string] wxXmlNode::GetPropValPtr(const wxString& propName) co... [truncated message content] |