From: John L. <jr...@us...> - 2006-06-12 02:48:44
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16835/wxLua/bindings/wxwidgets Modified Files: windows.i Log Message: Fix %enum ns1::ns2::EnumName to work Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** windows.i 17 May 2006 05:02:04 -0000 1.19 --- windows.i 12 Jun 2006 02:48:09 -0000 1.20 *************** *** 100,104 **** virtual void Enable(bool enable) static wxWindow* FindFocus() ! %overload %rename FindWindow wxWindow* FindWindow(long id) %overload %rename FindWindowName wxWindow* FindWindow(const wxString& name) static wxWindow* FindWindowById(long id, wxWindow* parent = NULL) --- 100,104 ---- virtual void Enable(bool enable) static wxWindow* FindFocus() ! %overload wxWindow* FindWindow(long id) %overload %rename FindWindowName wxWindow* FindWindow(const wxString& name) static wxWindow* FindWindowById(long id, wxWindow* parent = NULL) *************** *** 144,148 **** // %override [int x, int y] GetPositionXY(int x, int y) const - specify dummy x to get overload %overload %rename GetPositionXY virtual void GetPosition(int x=0, int y=0) const // (int* x, int* y) const ! %overload %rename GetPosition wxPoint GetPosition() const // FIXME virtual wxRect GetRect() const virtual int GetScrollPos(int orientation) --- 144,148 ---- // %override [int x, int y] GetPositionXY(int x, int y) const - specify dummy x to get overload %overload %rename GetPositionXY virtual void GetPosition(int x=0, int y=0) const // (int* x, int* y) const ! %overload wxPoint GetPosition() const virtual wxRect GetRect() const virtual int GetScrollPos(int orientation) *************** *** 213,217 **** void SetBestFittingSize(const wxSize& size = wxDefaultSize) void SetCaret(wxCaret *caret) const ! %overload %rename SetClientSize virtual void SetClientSize(const wxSize& size) %overload %rename SetClientSizeWH virtual void SetClientSize(int width, int height) void SetContainingSizer(wxSizer* sizer) --- 213,217 ---- void SetBestFittingSize(const wxSize& size = wxDefaultSize) void SetCaret(wxCaret *caret) const ! %overload virtual void SetClientSize(const wxSize& size) %overload %rename SetClientSizeWH virtual void SetClientSize(int width, int height) void SetContainingSizer(wxSizer* sizer) |