[Wxlua-commit] wxLua/modules/wxlua/include internal.h,1.27,1.28 wxlstate.h,1.44,1.45

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

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

Modified Files:
	internal.h wxlstate.h 
Log Message:
switch to wxHashMap from wxHashTable as wxHashTable has been deprecated since 2.4


Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** wxlstate.h	2 May 2006 22:46:53 -0000	1.44
--- wxlstate.h	4 May 2006 02:47:34 -0000	1.45
***************
*** 47,50 ****
--- 47,51 ----
  #include "wx/filefn.h"
  #include "wx/filename.h"
+ #include "wx/hashmap.h"
  
  class WXDLLIMPEXP_WXLUA wxLuaEvent;
***************
*** 52,55 ****
--- 53,58 ----
  class WXDLLIMPEXP_WXLUA wxLuaStateRefData;
  
+ WX_DECLARE_STRING_HASH_MAP_WITH_DECL(long, wxLuaStringToLongHashMap, class WXDLLIMPEXP_WXLUA);
+ 
  // ----------------------------------------------------------------------------
  // String functions - convert between Lua (ansi string) and wxString (encoded)
***************
*** 57,61 ****
  
  // Convert a 8-bit Lua String into wxString
! inline WXDLLIMPEXP_WXLUA wxString lua2wx(const char * luastr)
  {
      if (luastr == NULL)
--- 60,64 ----
  
  // Convert a 8-bit Lua String into wxString
! inline WXDLLIMPEXP_WXLUA wxString lua2wx(const char* luastr)
  {
      if (luastr == NULL)
***************
*** 123,140 ****
      wxEventType m_inEventType; // wxEventType set when in event, else wxEVT_NULL
  
!     wxHashTable* m_pDerivedList;       // derived objects.
!     wxHashTable* m_pTrackedList;       // tracked objects.
!     wxList       m_eventHandlerList;   // event objects for wxLuaCallback
!     wxList       m_destroyHandlerList; // wxLuaDestroyCallbacks installed
!     wxList       m_windowList;         // all wxWindow objects, wxWidgets will delete these
!                                        //   but for an embedded program they must be deleted before
!                                        //   shutting down the interpreter, else they dangle
!     wxArrayInt  m_usedIndexes;         // array of the lua tags
  
!     bool m_is_running;                 // is the lua_State running a script
!     bool m_is_closing;                 // are we currently being closed
  
!     bool m_debug_hook_break;           // should the lua_State break for next debug_hook
!     wxString m_debug_hook_break_msg;   // message when the breaking in the debug_hook
  
      unsigned long m_last_debug_hook_time; // last time the debug hook was called
--- 126,143 ----
      wxEventType m_inEventType; // wxEventType set when in event, else wxEVT_NULL
  
!     wxLongToLongHashMap m_pDerivedList; // derived objects.
!     wxLongToLongHashMap m_pTrackedList; // tracked objects.
!     wxList m_eventHandlerList;          // event objects for wxLuaCallback
!     wxList m_destroyHandlerList;        // wxLuaDestroyCallbacks installed
!     wxList m_windowList;                // all wxWindow objects, wxWidgets will delete these
!                                         //   but for an embedded program they must be deleted before
!                                         //   shutting down the interpreter, else they dangle
!     wxArrayInt  m_usedIndexes;          // array of the lua tags in the registry
  
!     bool m_is_running;                  // is the lua_State running a script
!     bool m_is_closing;                  // are we currently being closed
  
!     bool m_debug_hook_break;            // should the lua_State break for next debug_hook
!     wxString m_debug_hook_break_msg;    // message when the breaking in the debug_hook
  
      unsigned long m_last_debug_hook_time; // last time the debug hook was called
***************
*** 180,184 ****
      // ------------------------------------------------------------------------
  
!     lua_State *m_lua_State;         // the lua_State that "is" lua
      bool       m_lua_State_static;  // lua_close the lua_State if !static
  
--- 183,187 ----
      // ------------------------------------------------------------------------
  
!     lua_State* m_lua_State;         // the lua_State that "is" lua
      bool       m_lua_State_static;  // lua_close the lua_State if !static
  

Index: internal.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/internal.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** internal.h	8 Apr 2006 18:22:34 -0000	1.27
--- internal.h	4 May 2006 02:47:34 -0000	1.28
***************
*** 189,193 ****
      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:
--- 189,193 ----
      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, wxLuaStringToLongHashMap& dumpList, int indent);
  
  private: