Update of /cvsroot/wxlua/wxLua/modules/wxlua/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30668/wxLua/modules/wxlua/include
Modified Files:
wxlbind.h wxldefs.h wxlstate.h
Log Message:
Move all lua includes to wxldefs.h
Fix node != NULL warning
Make wxImageHistogram::iterator::SetFirst error out since you cannot set first value of a wxHashMap
Fix unicode error in wxlbind.cpp
Index: wxldefs.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** wxldefs.h 8 Jun 2007 01:36:31 -0000 1.20
--- wxldefs.h 8 Jun 2007 03:40:51 -0000 1.21
***************
*** 13,24 ****
#define __WX_WXLDEFS_H__
! #include "wx/defs.h"
extern "C"
{
! typedef struct lua_State lua_State;
! typedef struct lua_Debug lua_Debug;
}
//-----------------------------------------------------------------------------
// The version of wxLua - for convenience we use the current version of
--- 13,34 ----
#define __WX_WXLDEFS_H__
! //-----------------------------------------------------------------------------
! // Include the lua headers
! //-----------------------------------------------------------------------------
extern "C"
{
! #include "lua.h"
! #include "lualib.h"
! #include "lauxlib.h"
!
! // To not include "lua.h" use these
! //typedef struct lua_State lua_State;
! //typedef struct lua_Debug lua_Debug;
! //typedef int (*lua_CFunction)(lua_State *);
}
+ #include "wx/defs.h"
+
//-----------------------------------------------------------------------------
// The version of wxLua - for convenience we use the current version of
Index: wxlbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** wxlbind.h 8 Jun 2007 01:36:31 -0000 1.44
--- wxlbind.h 8 Jun 2007 03:40:51 -0000 1.45
***************
*** 12,21 ****
#include "wxlua/include/wxldefs.h"
- extern "C"
- {
- #include "lualib.h"
- #include "lauxlib.h"
- }
-
#ifdef GetObject
#undef GetObject // MSVC defines this
--- 12,15 ----
***************
*** 57,63 ****
// but are the min and max of all functions
! WXLUAMETHOD_OVERLOAD_BASE = 0x4000, // Class method has been checked to see if it is
// overloaded from the base class.
! // Check WXLUAMETHOD::basemethod and if !NULL
// this method is an overload from the base class
};
--- 51,57 ----
// but are the min and max of all functions
! WXLUAMETHOD_OVERLOAD_BASE = 0x4000, // Class method has been checked to see if it is
// overloaded from the base class.
! // Check WXLUAMETHOD::basemethod and if !NULL
// this method is an overload from the base class
};
Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** wxlstate.h 6 Jun 2007 23:43:16 -0000 1.72
--- wxlstate.h 8 Jun 2007 03:40:51 -0000 1.73
***************
*** 27,42 ****
#define _WXLSTATE_H_
- extern "C"
- {
- #include "lua.h"
- #include "lualib.h"
- #include "lauxlib.h"
-
- // To not include "lua.h" use these
- //typedef struct lua_State lua_State;
- //typedef struct lua_Debug lua_Debug;
- //typedef int (*lua_CFunction)(lua_State *);
- }
-
#include "wxlua/include/wxldefs.h"
#include "wxlua/include/wxlbind.h"
--- 27,30 ----
***************
*** 155,159 ****
! // Verify if the luatype = lua_type(L, stack_idx) is valid for the
// wxluaarg_tag which is one of the predefined WXLUAARG_XXX or s_wxluaarg_XXX types.
// Returns 1 if it matches, 0 if it doesn't, -1 if the wxluaarg_tag is not known.
--- 143,147 ----
! // Verify if the luatype = lua_type(L, stack_idx) is valid for the
// wxluaarg_tag which is one of the predefined WXLUAARG_XXX or s_wxluaarg_XXX types.
// Returns 1 if it matches, 0 if it doesn't, -1 if the wxluaarg_tag is not known.
|
