[Wxlua-commit] wxLua/apps/wxluaedit/src wxluaedit.cpp,1.23,1.24

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

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

Modified Files:
	wxluaedit.cpp 
Log Message:


Index: wxluaedit.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxluaedit.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** wxluaedit.cpp	15 Sep 2006 00:14:51 -0000	1.23
--- wxluaedit.cpp	28 Sep 2006 22:26:02 -0000	1.24
***************
*** 38,43 ****
  extern bool wxLuaBinding_wxluasocket_init();
  
- class LuaHandler;
- 
  wxWindowID ID_WXLUASTATE_DEBUG = 200;
  
--- 38,41 ----
***************
*** 85,95 ****
  
      void OnLua(wxLuaEvent &event);
-     void OnDebugStackEnum(wxLuaDebuggerEvent &event);
-     void OnDebugTableEnum(wxLuaDebuggerEvent &event);
-     void OnDebugStackEntryEnum(wxLuaDebuggerEvent &event);
  
      void DisplayError(const wxString &strError) const;
  
-     LuaHandler       *m_luaHandler;
      wxLuaDebugTarget *m_pDebugTarget;
      wxLuaState        m_wxlState;
--- 83,89 ----
***************
*** 100,119 ****
  };
  
- // ---------------------------------------------------------------------------
- // LuaHandler - routes commands from the wxLuaHandler to the app
- // ---------------------------------------------------------------------------
- 
- class LuaHandler : public wxLuaHandler
- {
- public:
-     LuaHandler(wxLuaEditorApp *app) : m_app(app) {}
- 
-     virtual void AddPendingEvent(wxEvent& event) { m_app->AddPendingEvent(event); }
-     virtual bool ProcessEvent(wxEvent& event) { return m_app->ProcessEvent(event); }
-     virtual void DisplayError(const wxString &strError) const { m_app->DisplayError(strError); }
- 
-     wxLuaEditorApp *m_app;
- };
- 
  // ----------------------------------------------------------------------------
  // wxLuaEditorFrame
--- 94,97 ----
***************
*** 154,166 ****
      EVT_LUA_ERROR       (ID_WXLUASTATE_DEBUG, wxLuaEditorApp::OnLua)
      EVT_LUA_DEBUG_HOOK  (ID_WXLUASTATE_DEBUG, wxLuaEditorApp::OnLua)
- 
-     EVT_WXLUA_DEBUGGER_STACK_ENUM(      wxLuaEditorApp::OnDebugStackEnum)
-     EVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM(wxLuaEditorApp::OnDebugStackEntryEnum)
-     EVT_WXLUA_DEBUGGER_TABLE_ENUM(      wxLuaEditorApp::OnDebugTableEnum)
  END_EVENT_TABLE()
  
  bool wxLuaEditorApp::OnInit()
  {
-     m_luaHandler   = new LuaHandler(this);
      m_pDebugTarget = NULL;
      m_programName  = argv[0];
--- 132,139 ----
***************
*** 341,345 ****
          m_wxlState.CloseLuaState(true);
          m_wxlState.Destroy();
-         delete m_luaHandler;
      }
  
--- 314,317 ----
***************
*** 374,401 ****
  }
  
- void wxLuaEditorApp::OnDebugStackEnum(wxLuaDebuggerEvent &event)
- {
-     if (wxLuaHandler::GetHandler().GetStackDialog() != NULL)
-         wxLuaHandler::GetHandler().GetStackDialog()->FillStackCombobox(event.GetDebugData());
-     else
-         event.Skip();
- }
- 
- void wxLuaEditorApp::OnDebugStackEntryEnum(wxLuaDebuggerEvent &event)
- {
-     if (wxLuaHandler::GetHandler().GetStackDialog() != NULL)
-         wxLuaHandler::GetHandler().GetStackDialog()->FillStackEntry(event.GetReference(), event.GetDebugData());
-     else
-         event.Skip();
- }
- 
- void wxLuaEditorApp::OnDebugTableEnum(wxLuaDebuggerEvent &event)
- {
-     if (wxLuaHandler::GetHandler().GetStackDialog() != NULL)
-         wxLuaHandler::GetHandler().GetStackDialog()->FillTableEntry(wxTreeItemId((wxTreeItemIdValue)event.GetReference()), event.GetDebugData());
-     else
-         event.Skip();
- }
- 
  void wxLuaEditorApp::DisplayError(const wxString &errorStr) const
  {
--- 346,349 ----