[Wxlua-commit] wxLua/modules/wxbind/src config.cpp,1.16,1.17 menutool.cpp,1.14,1.15

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

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

Modified Files:
	config.cpp menutool.cpp 
Log Message:
add ability to use wxItemKind in wxCreateMenu override
fix wxConfig:ReadInt to use long not double
lots of cleanup in editor.wx.lua, fix autocompletion, update keywords to 5.1, formatting


Index: config.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** config.cpp	2 May 2006 05:25:01 -0000	1.16
--- config.cpp	15 May 2006 21:55:35 -0000	1.17
***************
*** 511,515 ****
  {
      wxLuaState wxlState(L);
!     double returns;
      // get number of arguments
      int argCount = lua_gettop(L);
--- 511,515 ----
  {
      wxLuaState wxlState(L);
!     long returns = 0;
      // get number of arguments
      int argCount = lua_gettop(L);
***************
*** 535,539 ****
  {
      wxLuaState wxlState(L);
!     double returns;
      // get number of arguments
      int argCount = lua_gettop(L);
--- 535,539 ----
  {
      wxLuaState wxlState(L);
!     double returns = 0;
      // get number of arguments
      int argCount = lua_gettop(L);

Index: menutool.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/menutool.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** menutool.cpp	2 May 2006 05:25:02 -0000	1.14
--- menutool.cpp	15 May 2006 21:55:35 -0000	1.15
***************
*** 98,101 ****
--- 98,102 ----
                      wxString helpText;
                      wxString menuText;
+                     wxItemKind kind = wxITEM_NORMAL;
  
                      int iValue = (int)lua_tonumber(L, -1);
***************
*** 113,117 ****
                      lua_pop(L, 1);
  
!                     returns->Append(iValue, menuText, helpText);
                  }
              }
--- 114,124 ----
                      lua_pop(L, 1);
  
!                     lua_pushnumber(L, 4);
!                     lua_gettable(L, -2);
!                     if (lua_isnumber(L, -1))
!                         kind = (wxItemKind)wxlState.GetEnumerationType(-1);
!                     lua_pop(L, 1);
! 
!                     returns->Append(iValue, menuText, helpText, kind);
                  }
              }