[Wxlua-commit] wxLua/bindings/wxwidgets appframe.i, 1.24, 1.25 gdi.i, 1.32, 1.33 wx_datatypes.lua, 1.43, 1.44

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15689/wxLua/bindings/wxwidgets

Modified Files:
	appframe.i gdi.i wx_datatypes.lua 
Log Message:
update wxluaref.html
add wxIconBundle


Index: appframe.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** appframe.i	7 Dec 2006 06:32:42 -0000	1.24
--- appframe.i	19 Dec 2006 06:18:02 -0000	1.25
***************
*** 117,121 ****
      %wxchkver27 wxWindow* SetDefaultItem(wxWindow *win)
      void SetIcon(const wxIcon& icon)
!     //void SetIcons(const wxIconBundle& icons)
      //void SetLeftMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu * subMenu = NULL)
      //void SetRightMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu * subMenu = NULL)
--- 117,121 ----
      %wxchkver27 wxWindow* SetDefaultItem(wxWindow *win)
      void SetIcon(const wxIcon& icon)
!     void SetIcons(const wxIconBundle& icons)
      //void SetLeftMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu * subMenu = NULL)
      //void SetRightMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu * subMenu = NULL)

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** wx_datatypes.lua	14 Dec 2006 22:02:57 -0000	1.43
--- wx_datatypes.lua	19 Dec 2006 06:18:02 -0000	1.44
***************
*** 1598,1601 ****
--- 1598,1607 ----
      Name = "wxIcon",
    },
+   wxIconBundle = {
+     Condition = "wxLUA_USE_wxIcon",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxIconBundle",
+   },
    wxIconizeEvent = {
      BaseClass = "wxEvent",

Index: gdi.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** gdi.i	7 Dec 2006 06:32:42 -0000	1.32
--- gdi.i	19 Dec 2006 06:18:02 -0000	1.33
***************
*** 682,685 ****
--- 682,702 ----
  %endclass
  
+ //-----------------------------------------------------------------------------
+ // wxIconBundle
+ 
+ %class %delete %noclassinfo %encapsulate wxIconBundle
+     %constructor wxDefaultIconBundle()
+     //wxIconBundle( const wxString& file, long type ) use default and call AddIcon(file, type)
+     wxIconBundle( const wxIcon& icon )
+     %constructor wxIconBundleCopy( const wxIconBundle& ic )
+ 
+     %overload void AddIcon( const wxString& file, long type )
+     %overload void AddIcon( const wxIcon& icon );
+ 
+     const wxIcon& GetIcon( const wxSize& size ) const;
+     // equivalent to GetIcon( wxSize( size, size ) )
+     //const wxIcon& GetIcon( wxCoord size = wxDefaultCoord ) const
+ %endclass
+ 
  %endif //wxLUA_USE_wxIcon