Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32720/wxLua/modules/wxluadebug/src
Modified Files:
splttree.cpp staktree.cpp wxldebug.cpp
Log Message:
wxEVT_DEBUG_XXX -> wxEVT_WXLUA_DEBUG_XXX and export them for DLL
reorder libs for linking in wxluaedit
TRUE/FALSE -> true/false
EVENT_DEBUG_XXX and CMD_XXX -> wxLUA_EVENT_DEBUG_XXX wxLUA_CMD_XXX
Index: splttree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/splttree.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** splttree.cpp 29 Nov 2005 05:45:10 -0000 1.6
--- splttree.cpp 1 Dec 2005 04:17:29 -0000 1.7
***************
*** 99,103 ****
#endif
{
! ::ShowScrollBar((HWND) GetHWND(), SB_VERT, FALSE);
}
#if USE_GENERIC_TREECTRL
--- 99,103 ----
#endif
{
! ::ShowScrollBar((HWND) GetHWND(), SB_VERT, false);
}
#if USE_GENERIC_TREECTRL
***************
*** 125,129 ****
{
wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;
! win->wxGenericTreeCtrl::SetScrollbars(pixelsPerUnitX, pixelsPerUnitY, noUnitsX, 0, xPos, 0, /* noRefresh */ TRUE);
wxScrolledWindow* scrolledWindow = GetScrolledWindow();
--- 125,129 ----
{
wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;
! win->wxGenericTreeCtrl::SetScrollbars(pixelsPerUnitX, pixelsPerUnitY, noUnitsX, 0, xPos, 0, /* noRefresh */ true);
wxScrolledWindow* scrolledWindow = GetScrolledWindow();
***************
*** 261,267 ****
AdjustRemoteScrollbars();
if (m_firstCompanionWindow)
! m_firstCompanionWindow->Refresh(TRUE);
if (m_secondCompanionWindow)
! m_secondCompanionWindow->Refresh(TRUE);
event.Skip();
}
--- 261,267 ----
AdjustRemoteScrollbars();
if (m_firstCompanionWindow)
! m_firstCompanionWindow->Refresh(true);
if (m_secondCompanionWindow)
! m_secondCompanionWindow->Refresh(true);
event.Skip();
}
***************
*** 399,405 ****
wxTreeCtrl::DeleteAllItems();
if (m_firstCompanionWindow)
! m_firstCompanionWindow->Refresh(TRUE);
if (m_secondCompanionWindow)
! m_secondCompanionWindow->Refresh(TRUE);
}
--- 399,405 ----
wxTreeCtrl::DeleteAllItems();
if (m_firstCompanionWindow)
! m_firstCompanionWindow->Refresh(true);
if (m_secondCompanionWindow)
! m_secondCompanionWindow->Refresh(true);
}
***************
*** 613,617 ****
// TODO: scroll the window physically instead of just refreshing.
! Refresh(TRUE);
}
--- 613,617 ----
// TODO: scroll the window physically instead of just refreshing.
! Refresh(true);
}
***************
*** 745,749 ****
// Ensure that events being propagated back up the window hierarchy
// don't cause an infinite loop
! static bool inOnScroll = FALSE;
if (inOnScroll)
{
--- 745,749 ----
// Ensure that events being propagated back up the window hierarchy
// don't cause an infinite loop
! static bool inOnScroll = false;
if (inOnScroll)
{
***************
*** 751,755 ****
return;
}
! inOnScroll = TRUE;
int orient = event.GetOrientation();
--- 751,755 ----
return;
}
! inOnScroll = true;
int orient = event.GetOrientation();
***************
*** 758,762 ****
if (nScrollInc == 0)
{
! inOnScroll = FALSE;
return;
}
--- 758,762 ----
if (nScrollInc == 0)
{
! inOnScroll = false;
return;
}
***************
*** 764,768 ****
if (orient == wxHORIZONTAL)
{
! inOnScroll = FALSE;
event.Skip();
return;
--- 764,768 ----
if (orient == wxHORIZONTAL)
{
! inOnScroll = false;
event.Skip();
return;
***************
*** 771,775 ****
{
int newPos = m_yScrollPosition + nScrollInc;
! SetScrollPos(wxVERTICAL, newPos, TRUE );
}
--- 771,775 ----
{
int newPos = m_yScrollPosition + nScrollInc;
! SetScrollPos(wxVERTICAL, newPos, true );
}
***************
*** 804,807 ****
#endif
! inOnScroll = FALSE;
}
--- 804,807 ----
#endif
! inOnScroll = false;
}
Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxldebug.cpp 29 Nov 2005 23:52:12 -0000 1.5
--- wxldebug.cpp 1 Dec 2005 04:17:29 -0000 1.6
***************
*** 26,42 ****
#include "wxlua/include/internal.h"
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_CLIENT_CONNECTED)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_BREAK)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_PRINT)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_ERROR)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_EXIT)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_STACK_ENUM)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_STACK_ENTRY_ENUM)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_TABLE_ENUM)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_EVALUATE_EXPR)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_STARTDEBUGGER)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_STOPDEBUGGER)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_BREAKPOINT_ADDED)
! DEFINE_EVENT_TYPE(wxEVT_DEBUG_BREAKPOINT_REMOVED)
// ----------------------------------------------------------------------------
--- 26,42 ----
#include "wxlua/include/internal.h"
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_BREAK)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_PRINT)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_ERROR)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_EXIT)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_STACK_ENUM)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_TABLE_ENUM)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_STARTDEBUGGER)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_STOPDEBUGGER)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED)
// ----------------------------------------------------------------------------
Index: staktree.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** staktree.cpp 29 Nov 2005 05:45:10 -0000 1.8
--- staktree.cpp 1 Dec 2005 04:17:29 -0000 1.9
***************
*** 238,242 ****
m_scrolledWindow->SetTargetWindow(m_treeControl);
! m_scrolledWindow->EnableScrolling(FALSE, FALSE);
// Let the two controls know about each other
--- 238,242 ----
m_scrolledWindow->SetTargetWindow(m_treeControl);
! m_scrolledWindow->EnableScrolling(false, false);
// Let the two controls know about each other
***************
*** 504,508 ****
: wxRemotelyScrolledTreeCtrl(parent, id, pt, sz, style)
{
! m_imageList = new wxImageList(16, 16, TRUE);
#if !defined(__WXMSW__) // || wxUSE_XPM_IN_MSW
m_imageList->Add(wxIcon(icon1_xpm));
--- 504,508 ----
: wxRemotelyScrolledTreeCtrl(parent, id, pt, sz, style)
{
! m_imageList = new wxImageList(16, 16, true);
#if !defined(__WXMSW__) // || wxUSE_XPM_IN_MSW
m_imageList->Add(wxIcon(icon1_xpm));
|
