Home / Browse / wxLua / Mail / Archive

wxLua

Email Archive: wxlua-commit (read-only)

2005:	_Jan	_Feb	_Mar	_Apr	_May	_Jun (191)	_Jul (1)	_Aug (2)	_Sep	_Oct	_Nov (238)	_Dec (68)
2006:	_Jan (104)	_Feb (518)	_Mar (302)	_Apr (211)	_May (311)	_Jun (55)	_Jul (6)	_Aug (35)	_Sep (76)	_Oct (50)	_Nov (37)	_Dec (340)
2007:	_Jan (23)	_Feb (107)	_Mar (98)	_Apr (60)	_May (136)	_Jun (371)	_Jul (175)	_Aug (74)	_Sep (3)	_Oct (2)	_Nov (53)	_Dec (129)
2008:	_Jan (337)	_Feb (23)	_Mar (18)	_Apr (4)	_May (3)	_Jun	_Jul	_Aug (4)	_Sep	_Oct (33)	_Nov	_Dec (26)
2009:	_Jan (4)	_Feb (1)	_Mar (15)	_Apr	_May (35)	_Jun (11)	_Jul	_Aug	_Sep (19)	_Oct (26)	_Nov (11)	_Dec (11)
2010:	_Jan (4)	_Feb	_Mar	_Apr	_May (1)	_Jun	_Jul	_Aug (8)	_Sep	_Oct	_Nov (8)	_Dec (7)
2011:	_Jan	_Feb	_Mar (4)	_Apr (8)	_May (5)	_Jun (8)	_Jul (1)	_Aug	_Sep	_Oct (5)	_Nov (13)	_Dec


S	M	T	W	T	F	S
		1	2	3	4	5
		(4)
6	7	8	9	10	11	12

13	14	15	16	17	18	19

20	21	22	23	24	25	26

27	28	29	30

[Wxlua-commit] wxLua/samples editor.wx.lua,1.57,1.58

From: John Labenski <jrl1@us...> - 2008-04-01 05:10

Update of /cvsroot/wxlua/wxLua/samples
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20252/wxLua/samples

Modified Files:
	editor.wx.lua 
Log Message:
Ignore wxNotebook sending changed events when it's destroyed (the frame is too)


Index: editor.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** editor.wx.lua	22 Jan 2008 04:45:39 -0000	1.57
--- editor.wx.lua	1 Apr 2008 05:10:05 -0000	1.58
***************
*** 226,230 ****
  notebook:Connect(wx.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
          function (event)
!             SetEditorSelection(event:GetSelection())
              event:Skip() -- skip to let page change
          end)
--- 226,232 ----
  notebook:Connect(wx.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
          function (event)
!             if not exitingProgram then
!                 SetEditorSelection(event:GetSelection())
!             end
              event:Skip() -- skip to let page change
          end)

[Wxlua-commit] wxLua/apps/wxlua/src editor.h,1.41,1.42

From: John Labenski <jrl1@us...> - 2008-04-01 05:10

Update of /cvsroot/wxlua/wxLua/apps/wxlua/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20252/wxLua/apps/wxlua/src

Modified Files:
	editor.h 
Log Message:
Ignore wxNotebook sending changed events when it's destroyed (the frame is too)


Index: editor.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** editor.h	17 Jul 2007 14:45:14 -0000	1.41
--- editor.h	1 Apr 2008 05:10:04 -0000	1.42
***************
*** 10,15 ****
  extern const unsigned char wxLuaEditor[];
  
! const size_t wxLuaEditor_len = 90595;
! const unsigned char wxLuaEditor[90596] = {
   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10,
   45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10,
--- 10,15 ----
  extern const unsigned char wxLuaEditor[];
  
! const size_t wxLuaEditor_len = 91181;
! const unsigned char wxLuaEditor[91182] = {
   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10,
   45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10,
***************
*** 21,24 ****
--- 21,28 ----
   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10,
   10,
+  45, 45, 32, 76,111, 97,100, 32,116,104,101, 32,119,120, 76,117, 97, 32,109,111,100,117,108,101, 44, 32,100,111,101,115, 32,110,111,116,104,105,110,103, 32,105,102, 32,114,117,110,110,105,110,103, 32,102,114,111,109, 32,119,120, 76,117, 97, 44, 32,119,120, 76,117, 97, 70,114,101,101,122,101, 44, 32,111,114, 32,119,120, 76,117, 97, 69,100,105,116, 10,
+ 112, 97, 99,107, 97,103,101, 46, 99,112, 97,116,104, 32, 61, 32,112, 97, 99,107, 97,103,101, 46, 99,112, 97,116,104, 46, 46, 34, 59, 46, 47, 63, 46,100,108,108, 59, 46, 47, 63, 46,115,111, 59, 46, 46, 47,108,105, 98, 47, 63, 46,115,111, 59, 46, 46, 47,108,105, 98, 47,118, 99, 95,100,108,108, 47, 63, 46,100,108,108, 59, 46, 46, 47,108,105, 98, 47, 98, 99, 99, 95,100,108,108, 47, 63, 46,100,108,108, 59, 46, 46, 47,108,105, 98, 47,109,105,110,103,119, 95,100,108,108, 47, 63, 46,100,108,108, 59, 34, 10,
+ 114,101,113,117,105,114,101, 40, 34,119,120, 34, 41, 10,
+  10,
   45, 45, 32, 69,113,117,105,118, 97,108,101,110,116, 32,116,111, 32, 67, 39,115, 32, 34, 99,111,110,100, 32, 63, 32, 97, 32, 58, 32, 98, 34, 44, 32, 97,108,108, 32,116,101,114,109,115, 32,119,105,108,108, 32, 98,101, 32,101,118, 97,108,117, 97,116,101,100, 10,
  102,117,110, 99,116,105,111,110, 32,105,102,102, 40, 99,111,110,100, 44, 32, 97, 44, 32, 98, 41, 32,105,102, 32, 99,111,110,100, 32,116,104,101,110, 32,114,101,116,117,114,110, 32, 97, 32,101,108,115,101, 32,114,101,116,117,114,110, 32, 98, 32,101,110,100, 32,101,110,100, 10,
***************
*** 235,239 ****
  110,111,116,101, 98,111,111,107, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 78, 79, 84, 69, 66, 79, 79, 75, 95, 80, 65, 71, 69, 95, 67, 72, 65, 78, 71, 69, 68, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 83,101,116, 69,100,105,116,111,114, 83,101,108,101, 99,116,105,111,110, 40,101,118,101,110,116, 58, 71,101,116, 83,101,108,101, 99,116,105,111,110, 40, 41, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 58, 83,107,105,112, 40, 41, 32, 45, 45, 32,115,107,105,112, 32,116,111, 32,108,101,116, 32,112, 97,103,101, 32, 99,104, 97,110,103,101, 10,
   32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10,
--- 239,245 ----
  110,111,116,101, 98,111,111,107, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 78, 79, 84, 69, 66, 79, 79, 75, 95, 80, 65, 71, 69, 95, 67, 72, 65, 78, 71, 69, 68, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,110,111,116, 32,101,120,105,116,105,110,103, 80,114,111,103,114, 97,109, 32,116,104,101,110, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 83,101,116, 69,100,105,116,111,114, 83,101,108,101, 99,116,105,111,110, 40,101,118,101,110,116, 58, 71,101,116, 83,101,108,101, 99,116,105,111,110, 40, 41, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 58, 83,107,105,112, 40, 41, 32, 45, 45, 32,115,107,105,112, 32,116,111, 32,108,101,116, 32,112, 97,103,101, 32, 99,104, 97,110,103,101, 10,
   32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10,
***************
*** 2384,2387 ****
--- 2390,2399 ----
   45, 45,102,114, 97,109,101, 58, 83,101,116, 73, 99,111,110, 40,119,120, 76,117, 97, 69,100,105,116,111,114, 73, 99,111,110, 41, 32, 45, 45, 70, 73, 88, 77, 69, 32, 97,100,100, 32,116,104,105,115, 32, 98, 97, 99,107, 10,
  102,114, 97,109,101, 58, 83,104,111,119, 40,116,114,117,101, 41, 10,
+  10,
+  45, 45, 32, 67, 97,108,108, 32,119,120, 46,119,120, 71,101,116, 65,112,112, 40, 41, 58, 77, 97,105,110, 76,111,111,112, 40, 41, 32,108, 97,115,116, 32,116,111, 32,115,116, 97,114,116, 32,116,104,101, 32,119,120, 87,105,100,103,101,116,115, 32,101,118,101,110,116, 32,108,111,111,112, 44, 10,
+  45, 45, 32,111,116,104,101,114,119,105,115,101, 32,116,104,101, 32,119,120, 76,117, 97, 32,112,114,111,103,114, 97,109, 32,119,105,108,108, 32,101,120,105,116, 32,105,109,109,101,100,105, 97,116,101,108,121, 46, 10,
+  45, 45, 32, 68,111,101,115, 32,110,111,116,104,105,110,103, 32,105,102, 32,114,117,110,110,105,110,103, 32,102,114,111,109, 32,119,120, 76,117, 97, 44, 32,119,120, 76,117, 97, 70,114,101,101,122,101, 44, 32,111,114, 32,119,120, 76,117, 97, 69,100,105,116, 32,115,105,110, 99,101, 32,116,104,101, 10,
+  45, 45, 32, 77, 97,105,110, 76,111,111,112, 32,105,115, 32, 97,108,114,101, 97,100,121, 32,114,117,110,110,105,110,103, 32,111,114, 32,119,105,108,108, 32, 98,101, 32,115,116, 97,114,116,101,100, 32, 98,121, 32,116,104,101, 32, 67, 43, 43, 32,112,114,111,103,114, 97,109, 46, 10,
+ 119,120, 46,119,120, 71,101,116, 65,112,112, 40, 41, 58, 77, 97,105,110, 76,111,111,112, 40, 41, 10,
    0 };

[Wxlua-commit] wxLua/bindings/wxwidgets wxbase_file.i, 1.4, 1.5 wxcore_menutool.i, 1.3, 1.4

From: John Labenski <jrl1@us...> - 2008-04-01 04:19

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

Modified Files:
	wxbase_file.i wxcore_menutool.i 
Log Message:
Added new wxFileName and wxMenuItem methods


Index: wxbase_file.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_file.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxbase_file.i	29 Jan 2008 00:49:11 -0000	1.4
--- wxbase_file.i	1 Apr 2008 04:19:42 -0000	1.5
***************
*** 242,245 ****
--- 242,246 ----
      static wxString GetPathSeparators(wxPathFormat format = wxPATH_NATIVE)
      static wxString  GetPathTerminators(wxPathFormat format = wxPATH_NATIVE)
+     wxString GetPathWithSep(wxPathFormat format = wxPATH_NATIVE ) const
      wxString GetShortPath() const
  
***************
*** 288,291 ****
--- 289,293 ----
      void PrependDir(const wxString& dir)
      void RemoveDir(int pos)
+     void RemoveLastDir()
      bool Rmdir()
      static bool Rmdir(const wxString& dir)

Index: wxcore_menutool.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_menutool.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxcore_menutool.i	18 Dec 2007 01:03:32 -0000	1.3
--- wxcore_menutool.i	1 Apr 2008 04:19:42 -0000	1.4
***************
*** 154,157 ****
--- 154,166 ----
      // void SetName(const wxString& text) const - deprecated
      %win void SetTextColour(const wxColour& colour) const
+     
+     %if %wxchkver_2_8
+         void SetItemLabel(const wxString& str)
+         wxString GetItemLabel() const
+         wxString GetItemLabelText() const 
+ 
+         static wxString GetLabelText(const wxString& label)
+     %endif
+     
  %endclass

[Wxlua-commit] wxLua/modules/wxbind/src wxbase_file.cpp, 1.13, 1.14 wxcore_menutool.cpp, 1.13, 1.14

From: John Labenski <jrl1@us...> - 2008-04-01 04:19

Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv701/wxLua/modules/wxbind/src

Modified Files:
	wxbase_file.cpp wxcore_menutool.cpp 
Log Message:
Added new wxFileName and wxMenuItem methods


Index: wxbase_file.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_file.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wxbase_file.cpp	29 Jan 2008 04:22:52 -0000	1.13
--- wxbase_file.cpp	1 Apr 2008 04:19:42 -0000	1.14
***************
*** 1200,1203 ****
--- 1200,1223 ----
  }
  
+ static wxLuaArgType s_wxluatypeArray_wxLua_wxFileName_GetPathWithSep[] = { &wxluatype_wxFileName, &wxluatype_TINTEGER, NULL };
+ static int LUACALL wxLua_wxFileName_GetPathWithSep(lua_State *L);
+ static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileName_GetPathWithSep[1] = {{ wxLua_wxFileName_GetPathWithSep, WXLUAMETHOD_METHOD, 1, 2, s_wxluatypeArray_wxLua_wxFileName_GetPathWithSep }};
+ //     wxString GetPathWithSep(wxPathFormat format = wxPATH_NATIVE ) const
+ static int LUACALL wxLua_wxFileName_GetPathWithSep(lua_State *L)
+ {
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // wxPathFormat format = wxPATH_NATIVE
+     wxPathFormat format = (argCount >= 2 ? (wxPathFormat)wxlua_getintegertype(L, 2) : wxPATH_NATIVE);
+     // get this
+     wxFileName * self = (wxFileName *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileName);
+     // call GetPathWithSep
+     wxString returns = (self->GetPathWithSep(format));
+     // push the result string
+     wxlua_pushwxString(L, returns);
+ 
+     return 1;
+ }
+ 
  static wxLuaArgType s_wxluatypeArray_wxLua_wxFileName_GetShortPath[] = { &wxluatype_wxFileName, NULL };
  static int LUACALL wxLua_wxFileName_GetShortPath(lua_State *L);
***************
*** 1805,1808 ****
--- 1825,1842 ----
  }
  
+ static wxLuaArgType s_wxluatypeArray_wxLua_wxFileName_RemoveLastDir[] = { &wxluatype_wxFileName, NULL };
+ static int LUACALL wxLua_wxFileName_RemoveLastDir(lua_State *L);
+ static wxLuaBindCFunc s_wxluafunc_wxLua_wxFileName_RemoveLastDir[1] = {{ wxLua_wxFileName_RemoveLastDir, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxFileName_RemoveLastDir }};
+ //     void RemoveLastDir()
+ static int LUACALL wxLua_wxFileName_RemoveLastDir(lua_State *L)
+ {
+     // get this
+     wxFileName * self = (wxFileName *)wxluaT_getuserdatatype(L, 1, wxluatype_wxFileName);
+     // call RemoveLastDir
+     self->RemoveLastDir();
+ 
+     return 0;
+ }
+ 
  static wxLuaArgType s_wxluatypeArray_wxLua_wxFileName_Rmdir1[] = { &wxluatype_TSTRING, NULL };
  static int LUACALL wxLua_wxFileName_Rmdir1(lua_State *L);
***************
*** 2482,2485 ****
--- 2516,2520 ----
      { "GetPathSeparators", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxFileName_GetPathSeparators, 1, NULL },
      { "GetPathTerminators", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxFileName_GetPathTerminators, 1, NULL },
+     { "GetPathWithSep", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_GetPathWithSep, 1, NULL },
      { "GetShortPath", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_GetShortPath, 1, NULL },
  
***************
*** 2520,2523 ****
--- 2555,2559 ----
      { "PrependDir", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_PrependDir, 1, NULL },
      { "RemoveDir", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_RemoveDir, 1, NULL },
+     { "RemoveLastDir", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxFileName_RemoveLastDir, 1, NULL },
  
  #if (wxLUA_USE_wxFileName)

Index: wxcore_menutool.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_menutool.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wxcore_menutool.cpp	29 Jan 2008 04:22:53 -0000	1.13
--- wxcore_menutool.cpp	1 Apr 2008 04:19:42 -0000	1.14
***************
*** 1603,1606 ****
--- 1603,1642 ----
  }
  
+ 
+ #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+ static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_GetItemLabel[] = { &wxluatype_wxMenuItem, NULL };
+ static int LUACALL wxLua_wxMenuItem_GetItemLabel(lua_State *L);
+ static wxLuaBindCFunc s_wxluafunc_wxLua_wxMenuItem_GetItemLabel[1] = {{ wxLua_wxMenuItem_GetItemLabel, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxMenuItem_GetItemLabel }};
+ //         wxString GetItemLabel() const
+ static int LUACALL wxLua_wxMenuItem_GetItemLabel(lua_State *L)
+ {
+     // get this
+     wxMenuItem * self = (wxMenuItem *)wxluaT_getuserdatatype(L, 1, wxluatype_wxMenuItem);
+     // call GetItemLabel
+     wxString returns = (self->GetItemLabel());
+     // push the result string
+     wxlua_pushwxString(L, returns);
+ 
+     return 1;
+ }
+ 
+ static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_GetItemLabelText[] = { &wxluatype_wxMenuItem, NULL };
+ static int LUACALL wxLua_wxMenuItem_GetItemLabelText(lua_State *L);
+ static wxLuaBindCFunc s_wxluafunc_wxLua_wxMenuItem_GetItemLabelText[1] = {{ wxLua_wxMenuItem_GetItemLabelText, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxMenuItem_GetItemLabelText }};
+ //         wxString GetItemLabelText() const 
+ static int LUACALL wxLua_wxMenuItem_GetItemLabelText(lua_State *L)
+ {
+     // get this
+     wxMenuItem * self = (wxMenuItem *)wxluaT_getuserdatatype(L, 1, wxluatype_wxMenuItem);
+     // call GetItemLabelText
+     wxString returns = (self->GetItemLabelText());
+     // push the result string
+     wxlua_pushwxString(L, returns);
+ 
+     return 1;
+ }
+ 
+ #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+ 
  static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_GetKind[] = { &wxluatype_wxMenuItem, NULL };
  static int LUACALL wxLua_wxMenuItem_GetKind(lua_State *L);
***************
*** 1651,1654 ****
--- 1687,1710 ----
  }
  
+ 
+ #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+ static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_GetLabelText[] = { &wxluatype_TSTRING, NULL };
+ static int LUACALL wxLua_wxMenuItem_GetLabelText(lua_State *L);
+ static wxLuaBindCFunc s_wxluafunc_wxLua_wxMenuItem_GetLabelText[1] = {{ wxLua_wxMenuItem_GetLabelText, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 1, s_wxluatypeArray_wxLua_wxMenuItem_GetLabelText }};
+ //         static wxString GetLabelText(const wxString& label)
+ static int LUACALL wxLua_wxMenuItem_GetLabelText(lua_State *L)
+ {
+     // const wxString label
+     const wxString label = wxlua_getwxStringtype(L, 1);
+     // call GetLabelText
+     wxString returns = (wxMenuItem::GetLabelText(label));
+     // push the result string
+     wxlua_pushwxString(L, returns);
+ 
+     return 1;
+ }
+ 
+ #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+ 
  static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_GetMenu[] = { &wxluatype_wxMenuItem, NULL };
  static int LUACALL wxLua_wxMenuItem_GetMenu(lua_State *L);
***************
*** 1815,1818 ****
--- 1871,1894 ----
  }
  
+ 
+ #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+ static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_SetItemLabel[] = { &wxluatype_wxMenuItem, &wxluatype_TSTRING, NULL };
+ static int LUACALL wxLua_wxMenuItem_SetItemLabel(lua_State *L);
+ static wxLuaBindCFunc s_wxluafunc_wxLua_wxMenuItem_SetItemLabel[1] = {{ wxLua_wxMenuItem_SetItemLabel, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxMenuItem_SetItemLabel }};
+ //         void SetItemLabel(const wxString& str)
+ static int LUACALL wxLua_wxMenuItem_SetItemLabel(lua_State *L)
+ {
+     // const wxString str
+     const wxString str = wxlua_getwxStringtype(L, 2);
+     // get this
+     wxMenuItem * self = (wxMenuItem *)wxluaT_getuserdatatype(L, 1, wxluatype_wxMenuItem);
+     // call SetItemLabel
+     self->SetItemLabel(str);
+ 
+     return 0;
+ }
+ 
+ #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+ 
  static wxLuaArgType s_wxluatypeArray_wxLua_wxMenuItem_SetSubMenu[] = { &wxluatype_wxMenuItem, &wxluatype_wxMenu, NULL };
  static int LUACALL wxLua_wxMenuItem_SetSubMenu(lua_State *L);
***************
*** 1910,1916 ****
--- 1986,2003 ----
      { "GetHelp", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetHelp, 1, NULL },
      { "GetId", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetId, 1, NULL },
+ 
+ #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+     { "GetItemLabel", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetItemLabel, 1, NULL },
+     { "GetItemLabelText", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetItemLabelText, 1, NULL },
+ #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+ 
      { "GetKind", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetKind, 1, NULL },
      { "GetLabel", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetLabel, 1, NULL },
      { "GetLabelFromText", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxMenuItem_GetLabelFromText, 1, NULL },
+ 
+ #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+     { "GetLabelText", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxMenuItem_GetLabelText, 1, NULL },
+ #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+ 
      { "GetMenu", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetMenu, 1, NULL },
      { "GetSubMenu", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_GetSubMenu, 1, NULL },
***************
*** 1927,1930 ****
--- 2014,2022 ----
  
      { "SetHelp", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_SetHelp, 1, NULL },
+ 
+ #if (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+     { "SetItemLabel", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_SetItemLabel, 1, NULL },
+ #endif // (wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxCHECK_VERSION(2,8,0))
+ 
      { "SetSubMenu", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_SetSubMenu, 1, NULL },
      { "SetText", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxMenuItem_SetText, 1, NULL },