[Wxlua-commit] wxLua/modules/wxlua/include internal.h,1.12,1.13 wxlbind.h,1.5,1.6 wxlstate.h,1.7,1.8

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/wxlua/wxLua/modules/wxlua/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31708/wxLua/modules/wxlua/include

Modified Files:
	internal.h wxlbind.h wxlstate.h 
Log Message:
LuaDebugTarget -> wxLuaDebugTarget
wxLuaBind uses wxLuaState
more switching to wxLuaState
wxDEPRECATED for all C functions that require the wxLuaState (Varaibles) use class functions instead

Index: wxlbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxlbind.h	29 Nov 2005 23:52:12 -0000	1.5
--- wxlbind.h	30 Nov 2005 04:46:17 -0000	1.6
***************
*** 123,131 ****

      // Binds C Functions/Defines/Object/Events to Lua Table
!     virtual void RegisterBinding(lua_State *L, bool registerTypes);
      // Unbinds C Functions/Defines/Object/Events by clearing Lua Table
!     virtual void UnRegisterBinding(lua_State *L);

-     //
      size_t GetLuaClassCount() const { return m_classCount; }
      WXLUACLASS* GetLuaClassList() { return m_classList; }
--- 123,130 ----

      // Binds C Functions/Defines/Object/Events to Lua Table
!     virtual void RegisterBinding(const wxLuaState& wxlState, bool registerTypes);
      // Unbinds C Functions/Defines/Object/Events by clearing Lua Table
!     virtual void UnRegisterBinding(const wxLuaState& wxlState);

      size_t GetLuaClassCount() const { return m_classCount; }
      WXLUACLASS* GetLuaClassList() { return m_classList; }
***************
*** 153,162 ****
  protected:
      // Registers binding, returns lua table reference to binding
!     virtual int LUACALL RegisterFunctions(lua_State *L, bool registerTypes);
      // Register the classes, definitions, objects and pointers generated by the binding
      // Sort the event list into order for faster event handler processing.
!     virtual void LUACALL RegisterGeneratedClasses(lua_State *L, int tableOffset, bool registerTypes);

!     virtual void OnRegister(lua_State * WXUNUSED(L), bool WXUNUSED(registerTypes), int WXUNUSED(luaTable)) {}

      // binding objects
--- 152,161 ----
  protected:
      // Registers binding, returns lua table reference to binding
!     virtual int LUACALL RegisterFunctions(const wxLuaState& wxlState, bool registerTypes);
      // Register the classes, definitions, objects and pointers generated by the binding
      // Sort the event list into order for faster event handler processing.
!     virtual void LUACALL RegisterGeneratedClasses(const wxLuaState& wxlState, int tableOffset, bool registerTypes);

!     virtual void OnRegister(const wxLuaState& WXUNUSED(wxlState), bool WXUNUSED(registerTypes), int WXUNUSED(luaTable)) {}

      // binding objects

Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxlstate.h	29 Nov 2005 23:52:12 -0000	1.7
--- wxlstate.h	30 Nov 2005 04:46:17 -0000	1.8
***************
*** 219,223 ****

      void addToTrackedMemoryList(wxObject *pObject);
!     bool removeTrackedMemory(void *pObject, bool fDelete);

      void addToTrackedWindowList(wxWindow *win);
--- 219,223 ----

      void addToTrackedMemoryList(wxObject *pObject);
!     bool removeTrackedMemory(void *pObject, bool fDelete = true);

      void addToTrackedWindowList(wxWindow *win);

Index: internal.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/internal.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** internal.h	29 Nov 2005 23:52:12 -0000	1.12
--- internal.h	30 Nov 2005 04:46:17 -0000	1.13
***************
*** 115,120 ****
  // garbage collection purposes.
  void LUACALL addToTrackedMemoryList(lua_State *L, wxObject *);
! bool LUACALL removeTrackedMemory(lua_State *L, void *pObject, bool fDelete = true);
! void LUACALL addToTrackedWindowList(lua_State *L, wxWindow *);

  // ----------------------------------------------------------------------------
--- 115,120 ----
  // garbage collection purposes.
  void LUACALL addToTrackedMemoryList(lua_State *L, wxObject *);
! wxDEPRECATED( bool LUACALL removeTrackedMemory(lua_State *L, void *pObject, bool fDelete = true) );
! wxDEPRECATED( void LUACALL addToTrackedWindowList(lua_State *L, wxWindow *) );

  // ----------------------------------------------------------------------------
***************
*** 205,211 ****
  // or if the parameter iParam is nil, NULL is returned.
  // otherwise an error occurs
! void * LUACALL getuserdatatype(lua_State *, int iParam, int iTag);
  // set a user data type
! void LUACALL pushuserdatatype(lua_State *, int iTag, const void *data);

  // helper functions to get numbers, booleans and strings safer
--- 205,211 ----
  // or if the parameter iParam is nil, NULL is returned.
  // otherwise an error occurs
! wxDEPRECATED( void * LUACALL getuserdatatype(lua_State *, int iParam, int iTag) );
  // set a user data type
! wxDEPRECATED( void LUACALL pushuserdatatype(lua_State *, int iTag, const void *data) );

  // helper functions to get numbers, booleans and strings safer
***************
*** 247,251 ****

  // Given a lua tag, return the corresponding tag name
! const char * LUACALL GetLuaTagName(lua_State *L, int nTag);

  // global function in Lua for wiring
--- 247,251 ----

  // Given a lua tag, return the corresponding tag name
! wxDEPRECATED( const char * LUACALL GetLuaTagName(lua_State *L, int nTag) );

  // global function in Lua for wiring
***************
*** 254,263 ****

  // get the method or 'get' property for the class at cpIndex
! WXLUAMETHOD * LUACALL getLuaMethod(lua_State *L, const WXLUACLASS *pClass, const char *cpIndex, bool &isProperty);
  // get the property for the class at cpIndex
! WXLUAMETHOD * LUACALL getLuaProperty(lua_State *L, const WXLUACLASS *pClass, const char *cpIndex, bool isSet);

  // get the derived method for the class cpIndex
! lua_State * LUACALL getDerivedMethod(void *pObject, const char *method, lua_State *L = NULL);

  int LUACALL LuaCall(lua_State *L, int narg, int clear);
--- 254,263 ----

  // get the method or 'get' property for the class at cpIndex
! wxDEPRECATED( WXLUAMETHOD * LUACALL getLuaMethod(lua_State *L, const WXLUACLASS *pClass, const char *cpIndex, bool &isProperty) );
  // get the property for the class at cpIndex
! wxDEPRECATED( WXLUAMETHOD * LUACALL getLuaProperty(lua_State *L, const WXLUACLASS *pClass, const char *cpIndex, bool isSet) );

  // get the derived method for the class cpIndex
! wxDEPRECATED( lua_State * LUACALL getDerivedMethod(void *pObject, const char *method, lua_State *L = NULL) );

  int LUACALL LuaCall(lua_State *L, int narg, int clear);
***************
*** 270,278 ****

  // create a reference to the object at index iParam in the Lua index
! int LUACALL tinsert(lua_State *luaState, int iParam);
  // push onto the top of the stack the object referenced by iReference
  bool LUACALL tget(lua_State *luaState, int iReference);
  // remove a Lua reference
! bool LUACALL tremove(lua_State *luaState, int iReference);
  // Get the number of items in the reference table
  int  LUACALL tgetn(lua_State *luaState);
--- 270,278 ----

  // create a reference to the object at index iParam in the Lua index
! wxDEPRECATED( int LUACALL tinsert(lua_State *luaState, int iParam) );
  // push onto the top of the stack the object referenced by iReference
  bool LUACALL tget(lua_State *luaState, int iReference);
  // remove a Lua reference
! wxDEPRECATED( bool LUACALL tremove(lua_State *luaState, int iReference) );
  // Get the number of items in the reference table
  int  LUACALL tgetn(lua_State *luaState);
***************
*** 286,290 ****
  void * LUACALL ttouserdata (lua_State *L, int index, bool reset = false);
  // allocate a new metatable return its reference
! int   LUACALL tnewtag(lua_State *L);
  int   LUACALL tnewweaktag(lua_State *L, bool fWeakKey, bool fWeakData);
  // set the metatable of the object at top of stack from the reference tag
--- 286,290 ----
  void * LUACALL ttouserdata (lua_State *L, int index, bool reset = false);
  // allocate a new metatable return its reference
! wxDEPRECATED( int   LUACALL tnewtag(lua_State *L) );
  int   LUACALL tnewweaktag(lua_State *L, bool fWeakKey, bool fWeakData);
  // set the metatable of the object at top of stack from the reference tag
***************
*** 308,326 ****
  {
  public:
!     wxLuaCheckStack(lua_State *lua_state, const wxString &msg);
      ~wxLuaCheckStack();
      void TestStack(const wxString &msg);

!     static void DumpGlobals(lua_State *lua_state);
!     static void DumpTable(lua_State *lua_state, const wxString &tableName);
!     static void DumpTable(lua_State *lua_state, int index, const wxString& tablename, wxHashTable& dumpList, int indent);

  private:
!     static void     DumpType(lua_State *lua_state, int index, wxString& type, wxString& value, wxString& info);
!     static int      GetTableInfo(lua_State *lua_state, int index, wxString& address, wxString& info);
      static wxString MakeNumber(double dnum);
!     static wxString GetUserDataInfo(lua_State *lua_state, int index);

!     lua_State *m_luastate;
      wxString   m_msg;
      int        m_top;
--- 308,326 ----
  {
  public:
!     wxLuaCheckStack(lua_State *L, const wxString &msg);
      ~wxLuaCheckStack();
      void TestStack(const wxString &msg);

!     static void DumpGlobals(lua_State *L);
!     static void DumpTable(lua_State *L, const wxString &tableName);
!     static void DumpTable(lua_State *L, int index, const wxString& tablename, wxHashTable& dumpList, int indent);

  private:
!     static void     DumpType(lua_State *L, int index, wxString& type, wxString& value, wxString& info);
!     static int      GetTableInfo(lua_State *L, int index, wxString& address, wxString& info);
      static wxString MakeNumber(double dnum);
!     static wxString GetUserDataInfo(lua_State *L, int index);

!     lua_State *m_luaState;
      wxString   m_msg;
      int        m_top;