[Wxlua-commit] wxLua/modules/wxluadebug/src splttree.cpp,1.5,1.6 staktree.cpp,1.7,1.8 wxldebug.cpp,1.3,1.4

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

Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21610/wxLua/modules/wxluadebug/src

Modified Files:
	splttree.cpp staktree.cpp wxldebug.cpp 
Log Message:
Makefile - lib order is important
cleanup in lconsole, wxlua app
all static int s_wxXXX lua tags now s_wxluatag_wxXXX to make them easier to find
functions to get the structs with the bindings are prepended with wxLuaXXX
DECLARE/IMPLEMENT_CLASS replaced with either XXX_ABSTRACT/DYNAMIC_CLASS
window ids for the stacktree now ID_WXLUA_XXX


Index: splttree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/splttree.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** splttree.cpp	25 Nov 2005 22:00:36 -0000	1.5
--- splttree.cpp	29 Nov 2005 05:45:10 -0000	1.6
***************
*** 52,58 ****
  
  #if USE_GENERIC_TREECTRL
! IMPLEMENT_CLASS(wxRemotelyScrolledTreeCtrl, wxGenericTreeCtrl)
  #else
! IMPLEMENT_CLASS(wxRemotelyScrolledTreeCtrl, wxTreeCtrl)
  #endif
  
--- 52,58 ----
  
  #if USE_GENERIC_TREECTRL
! IMPLEMENT_ABSTRACT_CLASS(wxRemotelyScrolledTreeCtrl, wxGenericTreeCtrl)
  #else
! IMPLEMENT_ABSTRACT_CLASS(wxRemotelyScrolledTreeCtrl, wxTreeCtrl)
  #endif
  
***************
*** 143,147 ****
          UNREFERENCED_PARAMETER(yPos);
          UNREFERENCED_PARAMETER(noRefresh);
! # endif    
  #endif
  }
--- 143,147 ----
          UNREFERENCED_PARAMETER(yPos);
          UNREFERENCED_PARAMETER(noRefresh);
! # endif
  #endif
  }
***************
*** 165,169 ****
  # ifdef UNREFERENCED_PARAMETER
      UNREFERENCED_PARAMETER(orient);
! # endif    
  #endif
      return 0;
--- 165,169 ----
  # ifdef UNREFERENCED_PARAMETER
      UNREFERENCED_PARAMETER(orient);
! # endif
  #endif
      return 0;
***************
*** 223,227 ****
  # ifdef UNREFERENCED_PARAMETER
      UNREFERENCED_PARAMETER(dc);
! # endif  
  #endif
  }
--- 223,227 ----
  # ifdef UNREFERENCED_PARAMETER
      UNREFERENCED_PARAMETER(dc);
! # endif
  #endif
  }
***************
*** 500,504 ****
   */
  
! IMPLEMENT_CLASS(wxTreeCompanionWindow, wxWindow)
  
  BEGIN_EVENT_TABLE(wxTreeCompanionWindow, wxWindow)
--- 500,504 ----
   */
  
! IMPLEMENT_ABSTRACT_CLASS(wxTreeCompanionWindow, wxWindow)
  
  BEGIN_EVENT_TABLE(wxTreeCompanionWindow, wxWindow)
***************
*** 632,636 ****
   */
  
! IMPLEMENT_CLASS(wxThinSplitterWindow, wxSplitterWindow)
  
  BEGIN_EVENT_TABLE(wxThinSplitterWindow, wxSplitterWindow)
--- 632,636 ----
   */
  
! IMPLEMENT_ABSTRACT_CLASS(wxThinSplitterWindow, wxSplitterWindow)
  
  BEGIN_EVENT_TABLE(wxThinSplitterWindow, wxSplitterWindow)
***************
*** 717,721 ****
   */
  
! IMPLEMENT_CLASS(wxSplitterScrolledWindow, wxScrolledWindow)
  
  BEGIN_EVENT_TABLE(wxSplitterScrolledWindow, wxScrolledWindow)
--- 717,721 ----
   */
  
! IMPLEMENT_ABSTRACT_CLASS(wxSplitterScrolledWindow, wxScrolledWindow)
  
  BEGIN_EVENT_TABLE(wxSplitterScrolledWindow, wxScrolledWindow)

Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxldebug.cpp	26 Nov 2005 08:46:58 -0000	1.3
--- wxldebug.cpp	29 Nov 2005 05:45:10 -0000	1.4
***************
*** 44,48 ****
  // ----------------------------------------------------------------------------
  
! IMPLEMENT_CLASS(wxLuaBuffer, wxObject)
  
  // ----------------------------------------------------------------------------
--- 44,48 ----
  // ----------------------------------------------------------------------------
  
! IMPLEMENT_ABSTRACT_CLASS(wxLuaBuffer, wxObject)
  
  // ----------------------------------------------------------------------------
***************
*** 50,54 ****
  // ----------------------------------------------------------------------------
  
! IMPLEMENT_CLASS(wxLuaDebuggerBase, wxEvtHandler)
  
  // ----------------------------------------------------------------------------
--- 50,54 ----
  // ----------------------------------------------------------------------------
  
! IMPLEMENT_ABSTRACT_CLASS(wxLuaDebuggerBase, wxEvtHandler)
  
  // ----------------------------------------------------------------------------

Index: staktree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** staktree.cpp	26 Nov 2005 08:46:58 -0000	1.7
--- staktree.cpp	29 Nov 2005 05:45:10 -0000	1.8
***************
*** 102,105 ****
--- 102,113 ----
  // wxLuaStackFrame
  // ----------------------------------------------------------------------------
+ IMPLEMENT_ABSTRACT_CLASS(wxLuaStackFrame, wxDialog)
+ 
+ BEGIN_EVENT_TABLE(wxLuaStackFrame, wxDialog)
+     EVT_SIZE(wxLuaStackFrame::OnSizeWindow)
+     EVT_COMBOBOX(ID_WXLUA_STACKFRAME_COMBO, wxLuaStackFrame::OnSelectStack)
+     EVT_TREE_ITEM_EXPANDING(ID_WXLUA_STACKFRAME_STACKTREE, wxLuaStackFrame::OnItemExpanding)
+     EVT_BUTTON(ID_WXLUA_STACKFRAME_DISMISS_BUTTON, wxLuaStackFrame::OnCloseDialog)
+ END_EVENT_TABLE()
  
  wxLuaStackFrame::wxLuaStackFrame( wxWindow *parent,
***************
*** 108,112 ****
                                    const wxSize     &size,
                                    wxLuaDebugServer *pServer)
!                 : wxDialog(parent, idSTACK_FRAME, title, pos, size,
                    wxCAPTION | wxSYSTEM_MENU | wxDIALOG_MODAL | wxRESIZE_BORDER),
           m_luaInterface(NULL),
--- 116,120 ----
                                    const wxSize     &size,
                                    wxLuaDebugServer *pServer)
!                 : wxDialog(parent, ID_WXLUA_STACKFRAME, title, pos, size,
                    wxCAPTION | wxSYSTEM_MENU | wxDIALOG_MODAL | wxRESIZE_BORDER),
           m_luaInterface(NULL),
***************
*** 121,125 ****
                                    const wxSize     &size,
                                    wxLuaInterface   *luaInterface)
!                 : wxDialog(parent, idSTACK_FRAME, title, pos, size,
                    wxCAPTION | wxSYSTEM_MENU | wxDIALOG_MODAL | wxRESIZE_BORDER),
                    m_luaInterface(luaInterface),
--- 129,133 ----
                                    const wxSize     &size,
                                    wxLuaInterface   *luaInterface)
!                 : wxDialog(parent, ID_WXLUA_STACKFRAME, title, pos, size,
                    wxCAPTION | wxSYSTEM_MENU | wxDIALOG_MODAL | wxRESIZE_BORDER),
                    m_luaInterface(luaInterface),
***************
*** 151,155 ****
  
      m_stackComboBox = new wxComboBox( this,
!                                       idSTACK_COMBOBOX,
                                        wxEmptyString,
                                        wxPoint(0, 0),
--- 159,163 ----
  
      m_stackComboBox = new wxComboBox( this,
!                                       ID_WXLUA_STACKFRAME_COMBO,
                                        wxEmptyString,
                                        wxPoint(0, 0),
***************
*** 160,164 ****
  
      m_scrolledWindow = new wxSplitterScrolledWindow(this,
!                                                     idSCROLLED_WINDOW,
                                                      wxDefaultPosition,
                                                      wxDefaultSize,
--- 168,172 ----
  
      m_scrolledWindow = new wxSplitterScrolledWindow(this,
!                                                     ID_WXLUA_STACKFRAME_SCRWIN,
                                                      wxDefaultPosition,
                                                      wxDefaultSize,
***************
*** 168,172 ****
  #if wxCHECK_VERSION(2, 3, 0)
      m_dismissButton = new wxButton(this,
!                                    idDISMISS_BUTTON,
                                     _("Cancel"),
                                     wxDefaultPosition,
--- 176,180 ----
  #if wxCHECK_VERSION(2, 3, 0)
      m_dismissButton = new wxButton(this,
!                                    ID_WXLUA_STACKFRAME_DISMISS_BUTTON,
                                     _("Cancel"),
                                     wxDefaultPosition,
***************
*** 175,179 ****
  #else
      m_dismissButton = new wxButton(this,
!                                    idDISMISS_BUTTON,
                                     _("Cancel"),
                                     wxDefaultPosition,
--- 183,187 ----
  #else
      m_dismissButton = new wxButton(this,
!                                    ID_WXLUA_STACKFRAME_DISMISS_BUTTON,
                                     _("Cancel"),
                                     wxDefaultPosition,
***************
*** 182,186 ****
      m_dismissButton->SetDefault();
      m_treeSplitter = new wxThinSplitterWindow(m_scrolledWindow,
!                                               idSPLITTER_WINDOW,
                                                wxDefaultPosition,
                                                wxDefaultSize,
--- 190,194 ----
      m_dismissButton->SetDefault();
      m_treeSplitter = new wxThinSplitterWindow(m_scrolledWindow,
!                                               ID_WXLUA_STACKFRAME_SPLITWIN,
                                                wxDefaultPosition,
                                                wxDefaultSize,
***************
*** 191,195 ****
  #if wxCHECK_VERSION(2, 3, 0)
      m_treeControl = new wxLuaStackTree(m_treeSplitter,
!                                   idSTACKTREE_CTRL,
                                    wxDefaultPosition,
                                    wxDefaultSize,
--- 199,203 ----
  #if wxCHECK_VERSION(2, 3, 0)
      m_treeControl = new wxLuaStackTree(m_treeSplitter,
!                                   ID_WXLUA_STACKFRAME_STACKTREE,
                                    wxDefaultPosition,
                                    wxDefaultSize,
***************
*** 197,201 ****
  #else
      m_treeControl = new wxLuaStackTree(m_treeSplitter,
!                                   idSTACKTREE_CTRL,
                                    wxDefaultPosition,
                                    wxDefaultSize,
--- 205,209 ----
  #else
      m_treeControl = new wxLuaStackTree(m_treeSplitter,
!                                   ID_WXLUA_STACKFRAME_STACKTREE,
                                    wxDefaultPosition,
                                    wxDefaultSize,
***************
*** 203,207 ****
  #endif
      m_valueSplitter = new wxThinSplitterWindow(m_treeSplitter,
!                                                idVALUE_SPLITTER_WINDOW,
                                                 wxDefaultPosition,
                                                 wxDefaultSize,
--- 211,215 ----
  #endif
      m_valueSplitter = new wxThinSplitterWindow(m_treeSplitter,
!                                                ID_WXLUA_STACKFRAME_VALUE_SPLITWIN,
                                                 wxDefaultPosition,
                                                 wxDefaultSize,
***************
*** 210,219 ****
  
      m_firstValueWindow = new wxLuaStackDataWindow(m_valueSplitter,
!                                              idFIRST_VALUE_WINDOW,
                                               wxDefaultPosition,
                                               wxDefaultSize,
                                               wxNO_BORDER);
      m_secondValueWindow = new wxLuaStackDataWindow(m_valueSplitter,
!                                              idSECOND_VALUE_WINDOW,
                                               wxDefaultPosition,
                                               wxDefaultSize,
--- 218,227 ----
  
      m_firstValueWindow = new wxLuaStackDataWindow(m_valueSplitter,
!                                              ID_WXLUA_STACKFRAME_VALUE_WIN1,
                                               wxDefaultPosition,
                                               wxDefaultSize,
                                               wxNO_BORDER);
      m_secondValueWindow = new wxLuaStackDataWindow(m_valueSplitter,
!                                              ID_WXLUA_STACKFRAME_VALUE_WIN2,
                                               wxDefaultPosition,
                                               wxDefaultSize,
***************
*** 282,292 ****
  }
  
- BEGIN_EVENT_TABLE(wxLuaStackFrame, wxDialog)
-     EVT_SIZE(wxLuaStackFrame::OnSizeWindow)
-     EVT_COMBOBOX(idSTACK_COMBOBOX, wxLuaStackFrame::OnSelectStack)
-     EVT_TREE_ITEM_EXPANDING(idSTACKTREE_CTRL, wxLuaStackFrame::OnItemExpanding)
-     EVT_BUTTON(idDISMISS_BUTTON, wxLuaStackFrame::OnCloseDialog)
- END_EVENT_TABLE()
- 
  void wxLuaStackFrame::OnSizeWindow(wxSizeEvent &event)
  {
--- 290,293 ----
***************
*** 462,469 ****
      else
      {
!         size_t count;
!         for (count = 0; count < pSortedList->Count(); ++count)
          {
!             const wxLuaDebugDataItem *item = pSortedList->Item(count);
  
              int nOffset = 1;
--- 463,470 ----
      else
      {
!         size_t n, count = pSortedList->Count();
!         for (n = 0; n < count; ++n)
          {
!             const wxLuaDebugDataItem *item = pSortedList->Item(n);
  
              int nOffset = 1;
***************
*** 491,494 ****
--- 492,499 ----
  // wxLuaStackTree
  // ----------------------------------------------------------------------------
+ IMPLEMENT_ABSTRACT_CLASS(wxLuaStackTree, wxRemotelyScrolledTreeCtrl)
+ 
+ BEGIN_EVENT_TABLE(wxLuaStackTree, wxRemotelyScrolledTreeCtrl)
+ END_EVENT_TABLE()
  
  wxLuaStackTree::wxLuaStackTree( wxWindow    *parent,
***************
*** 512,520 ****
  }
  
- IMPLEMENT_CLASS(wxLuaStackTree, wxRemotelyScrolledTreeCtrl)
- 
- BEGIN_EVENT_TABLE(wxLuaStackTree, wxRemotelyScrolledTreeCtrl)
- END_EVENT_TABLE()
- 
  wxLuaStackTree::~wxLuaStackTree()
  {
--- 517,520 ----
***************
*** 526,529 ****
--- 526,531 ----
  // wxLuaStackDataWindow
  // ----------------------------------------------------------------------------
+ IMPLEMENT_ABSTRACT_CLASS(wxLuaStackDataWindow, wxTreeCompanionWindow)
+ 
  BEGIN_EVENT_TABLE(wxLuaStackDataWindow, wxTreeCompanionWindow)
  END_EVENT_TABLE()