[Wxlua-commit] wxLua/modules/wxluadebug/src staktree.cpp, 1.35, 1.36

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

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

Modified Files:
	staktree.cpp 
Log Message:
rem out debugging code in wxlbind.cpp
only measure the text height once for the stack window
make scribble faster by drawing to the window first


Index: staktree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** staktree.cpp	14 Dec 2006 01:01:27 -0000	1.35
--- staktree.cpp	26 Feb 2007 05:17:30 -0000	1.36
***************
*** 108,118 ****
                                               wxNO_BORDER, false);
  
-     m_treeSplitter->SetSashPosition(25);
-     m_treeSplitter->SetMinimumPaneSize(10);
      m_treeSplitter->SplitVertically(m_treeControl, m_valueSplitter);
  
      m_valueSplitter->SetSashPosition(125);
      m_valueSplitter->SetMinimumPaneSize(10);
-     m_valueSplitter->SplitVertically(m_firstValueWindow, m_secondValueWindow);
  
      m_scrolledWindow->SetTargetWindow(m_treeControl);
--- 108,118 ----
                                               wxNO_BORDER, false);
  
      m_treeSplitter->SplitVertically(m_treeControl, m_valueSplitter);
+     m_treeSplitter->SetSashPosition(200);
+     m_treeSplitter->SetMinimumPaneSize(10);
  
+     m_valueSplitter->SplitVertically(m_firstValueWindow, m_secondValueWindow);
      m_valueSplitter->SetSashPosition(125);
      m_valueSplitter->SetMinimumPaneSize(10);
  
      m_scrolledWindow->SetTargetWindow(m_treeControl);
***************
*** 434,437 ****
--- 434,438 ----
                       :wxTreeCompanionWindow(parent, id, pos, sz, style), m_first_window(first_window)
  {
+     m_text_height = 0;
      SetBackgroundColour(*wxWHITE);
  }
***************
*** 450,458 ****
          wxString txt(m_first_window ? itemData->GetType() : itemData->GetValue());
  
!         int text_width = 0, text_height = 0;
!         dc.GetTextExtent(txt, &text_width, &text_height);
  
          int x = 5;
!         int y = (rect.GetHeight() - text_height) / 2; // try to center it, else pin to top
          y = rect.GetY() + wxMax(0, y);
  
--- 451,463 ----
          wxString txt(m_first_window ? itemData->GetType() : itemData->GetValue());
  
!         if (m_text_height == 0)
!         {
!             int text_width = 0;
!             dc.GetTextExtent(wxT("1234ABCDEabcdejZ"), &text_width, &m_text_height);
!         }
  
          int x = 5;
!         int y = (rect.GetHeight() - m_text_height) / 2; // try to center it, else pin to top
! 
          y = rect.GetY() + wxMax(0, y);