[Wxlua-commit] wxLua/modules/wxluadebug/src wxlstack.cpp, 1.29, 1.30

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

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

Modified Files:
	wxlstack.cpp 
Log Message:
Force include of wxluasetup.h, temporarily, until a better way is found


Index: wxlstack.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxlstack.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** wxlstack.cpp	20 Dec 2007 02:26:58 -0000	1.29
--- wxlstack.cpp	11 Jan 2008 00:32:36 -0000	1.30
***************
*** 87,97 ****
      {
          wxLuaStackListData* stkListData = (wxLuaStackListData*)m_stkDlg->m_listData[item];
!         wxCHECK_MSG(stkListData, NULL, wxT("Invalid wxLuaStackListData item"));
          wxLuaDebugItem* debugItem = stkListData->GetDebugItem();
!         wxCHECK_MSG(debugItem, NULL, wxT("Invalid wxLuaDebugItem item"));
!     
          if (column == wxLuaStackDialog::LIST_COL_KEY)
              return m_stkDlg->GetItemImage(debugItem);
!         else if (column == wxLuaStackDialog::LIST_COL_KEY_TYPE)        
          {
              if (debugItem->GetFlagBit(WXLUA_DEBUGITEM_KEY_REF))
--- 87,97 ----
      {
          wxLuaStackListData* stkListData = (wxLuaStackListData*)m_stkDlg->m_listData[item];
!         wxCHECK_MSG(stkListData, -1, wxT("Invalid wxLuaStackListData item"));
          wxLuaDebugItem* debugItem = stkListData->GetDebugItem();
!         wxCHECK_MSG(debugItem, -1, wxT("Invalid wxLuaDebugItem item"));
! 
          if (column == wxLuaStackDialog::LIST_COL_KEY)
              return m_stkDlg->GetItemImage(debugItem);
!         else if (column == wxLuaStackDialog::LIST_COL_KEY_TYPE)
          {
              if (debugItem->GetFlagBit(WXLUA_DEBUGITEM_KEY_REF))
***************
*** 103,107 ****
              }
          }
!         else if (column == wxLuaStackDialog::LIST_COL_VALUE_TYPE)        
          {
              if (debugItem->GetFlagBit(WXLUA_DEBUGITEM_VALUE_REF))
--- 103,107 ----
              }
          }
!         else if (column == wxLuaStackDialog::LIST_COL_VALUE_TYPE)
          {
              if (debugItem->GetFlagBit(WXLUA_DEBUGITEM_VALUE_REF))
***************
*** 404,408 ****
      dc.SelectObject(bmp);
  
!     wxFont font(m_img_font_size, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);   
      wxCoord w = 0, h = 0;
  
--- 404,408 ----
      dc.SelectObject(bmp);
  
!     wxFont font(m_img_font_size, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
      wxCoord w = 0, h = 0;