[Wxlua-commit] wxLua/modules/wxluadebug/include wxlstack.h, 1.11, 1.12

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

Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv543/wxLua/modules/wxluadebug/include

Modified Files:
	wxlstack.h 
Log Message:
Fix collapse bug in stack dialog


Index: wxlstack.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxlstack.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** wxlstack.h	30 Nov 2007 23:00:08 -0000	1.11
--- wxlstack.h	2 Dec 2007 20:57:34 -0000	1.12
***************
*** 51,54 ****
--- 51,55 ----
  
      ID_WXLUA_STACK_FINDMENU_CASE,
+     ID_WXLUA_STACK_FINDMENU_WHOLE_STRING,
      ID_WXLUA_STACK_FINDMENU_ALL,
      ID_WXLUA_STACK_FINDMENU_NAME,
***************
*** 60,64 ****
  
  // ----------------------------------------------------------------------------
! // wxLuaStackListData - the data we store in the wxListCtrl item's data
  // ----------------------------------------------------------------------------
  
--- 61,67 ----
  
  // ----------------------------------------------------------------------------
! // wxLuaStackListData - the data we store for the listctrl.
! //
! // Note: We do not use a tree structure for speed at the expense of memory.
  // ----------------------------------------------------------------------------
  
***************
*** 144,149 ****
      // Draw the string centered in the bitmap
      virtual wxBitmap CreateBmpString(const wxBitmap& bmp, const wxString& s);
!     // Set the image and color to use
      virtual int GetItemImage(const wxLuaDebugItem *dbgItem);
  
      // Override these functions if you need to provide an alternate way to get
--- 147,154 ----
      // Draw the string centered in the bitmap
      virtual wxBitmap CreateBmpString(const wxBitmap& bmp, const wxString& s);
!     // Get the IMG_XXX enum to use for this dataitem
      virtual int GetItemImage(const wxLuaDebugItem *dbgItem);
+     // Get the string to show in the wxListCtrl
+     virtual wxString GetItemText(long item, long column, bool exact_value = false);
  
      // Override these functions if you need to provide an alternate way to get
***************
*** 179,183 ****
      void OnFind(wxCommandEvent& event);
  
!     // Handle and set the stack from the stack combobox selection
      void OnSelectStack(wxCommandEvent &event);
      void SelectStack(int stack_sel);
--- 184,188 ----
      void OnFind(wxCommandEvent& event);
  
!     // Handle and set the stack from the stack combo selection
      void OnSelectStack(wxCommandEvent &event);
      void SelectStack(int stack_sel);
***************
*** 185,194 ****
      void OnTreeItem(wxTreeEvent &event);
      // Handle and expand/collapse a listctrl item
!     void OnListItemActivated(wxListEvent &event);
      // Popup menu on right click
      void OnListRightClick(wxListEvent &event);
  
!     // Main functions to expand or collapse a list item
      bool ExpandItem(long lc_item);
      bool CollapseItem(long lc_item);
  
--- 190,202 ----
      void OnTreeItem(wxTreeEvent &event);
      // Handle and expand/collapse a listctrl item
!     void OnListItem(wxListEvent &event);
      // Popup menu on right click
      void OnListRightClick(wxListEvent &event);
  
!     // Expand a single list item 
      bool ExpandItem(long lc_item);
+     // Expand a list item and all it's children
+     bool ExpandItemChildren(long lc_item);
+     // Collapse an item and it's children
      bool CollapseItem(long lc_item);