From: John L. <jr...@us...> - 2007-07-02 00:05:17
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16205/wxLua/bindings/wxwidgets Modified Files: gdi.i windows.i Log Message: Fix the args for int arrays in bindings generator Add wxMediaCtrl sample media.wx.lua Turn on wxGL and wxMediaCtrl in wxLua, but they're still #if wxUSE_GLCANVAS/MEDIACTRL Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** windows.i 30 Jun 2007 00:12:20 -0000 1.50 --- windows.i 2 Jul 2007 00:05:13 -0000 1.51 *************** *** 249,258 **** virtual bool ScrollPages(int pages) virtual void ScrollWindow(int dx, int dy, const wxRect* rect = NULL) ! wxLUA_USE_wxAcceleratorTable virtual void SetAcceleratorTable(const wxAcceleratorTable& accel) //void SetAccessible(wxAccessible* accessible) void SetAutoLayout(bool autoLayout) virtual void SetBackgroundColour(const wxColour& colour) virtual void SetBackgroundStyle(wxBackgroundStyle style) ! void SetBestFittingSize(const wxSize& size = wxDefaultSize) // deprecated in 2.8 use SetInitialSize void SetCaret(wxCaret *caret) const virtual void SetClientSize(const wxSize& size) --- 249,258 ---- virtual bool ScrollPages(int pages) virtual void ScrollWindow(int dx, int dy, const wxRect* rect = NULL) ! virtual void SetAcceleratorTable(const wxAcceleratorTable& accel) //void SetAccessible(wxAccessible* accessible) void SetAutoLayout(bool autoLayout) virtual void SetBackgroundColour(const wxColour& colour) virtual void SetBackgroundStyle(wxBackgroundStyle style) ! !%wxchkver_2_8 void SetBestFittingSize(const wxSize& size = wxDefaultSize) // deprecated in 2.8 use SetInitialSize void SetCaret(wxCaret *caret) const virtual void SetClientSize(const wxSize& size) *************** *** 263,266 **** --- 263,267 ---- !%wxchkver_2_8 wxWindow* SetDefaultItem(wxWindow *win) // virtual void SetInitialBestSize(const wxSize& size) protected + %wxchkver_2_8 void SetInitialSize(const wxSize& size = wxDefaultSize) void SetMaxSize(const wxSize& size) void SetMinSize(const wxSize& size) Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** gdi.i 30 Jun 2007 00:12:20 -0000 1.61 --- gdi.i 2 Jul 2007 00:05:13 -0000 1.62 *************** *** 1627,1637 **** %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 ! // 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) ! ! 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) wxGLContext* GetContext() const --- 1627,1634 ---- %class wxGLCanvas, wxWindow ! wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) ! wxGLCanvas(wxWindow* parent, wxGLContext* sharedContext, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) ! wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) ! wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, int attribList[] = 0, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", const wxPalette& palette = wxNullPalette) wxGLContext* GetContext() const |