Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

build fix for wxUSE_DRAGIMAGE==0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@45841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-05-05 18:48:56 +00:00
parent 446e3c13a4
commit c5fd16fca0
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/treectrl.h
View File

@@ -291,8 +291,10 @@ private:
// true if the hash above is not empty // true if the hash above is not empty
bool m_hasAnyAttr; bool m_hasAnyAttr;
#if wxUSE_DRAGIMAGE
// used for dragging // used for dragging
wxDragImage *m_dragImage; wxDragImage *m_dragImage;
#endif
// Virtual root item, if wxTR_HIDE_ROOT is set. // Virtual root item, if wxTR_HIDE_ROOT is set.
void* m_pVirtualRoot; void* m_pVirtualRoot;

8
src/msw/treectrl.cpp
View File

@@ -622,7 +622,9 @@ void wxTreeCtrl::Init()
{ {
m_textCtrl = NULL; m_textCtrl = NULL;
m_hasAnyAttr = false; m_hasAnyAttr = false;
#if wxUSE_DRAGIMAGE
m_dragImage = NULL; m_dragImage = NULL;
#endif
m_pVirtualRoot = NULL; m_pVirtualRoot = NULL;
// initialize the global array of events now as it can't be done statically // initialize the global array of events now as it can't be done statically
@@ -2198,6 +2200,7 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
} }
#endif // __WXWINCE__ #endif // __WXWINCE__
#if wxUSE_DRAGIMAGE
if ( m_dragImage ) if ( m_dragImage )
{ {
m_dragImage->Move(wxPoint(x, y)); m_dragImage->Move(wxPoint(x, y));
@@ -2210,6 +2213,7 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
m_dragImage->Show(); m_dragImage->Show();
} }
} }
#endif // wxUSE_DRAGIMAGE
break; break;
case WM_LBUTTONUP: case WM_LBUTTONUP:
@@ -2235,6 +2239,7 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
// fall through // fall through
case WM_RBUTTONUP: case WM_RBUTTONUP:
#if wxUSE_DRAGIMAGE
if ( m_dragImage ) if ( m_dragImage )
{ {
m_dragImage->EndDrag(); m_dragImage->EndDrag();
@@ -2250,6 +2255,7 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
// are selected simultaneously which is quite weird // are selected simultaneously which is quite weird
TreeView_SelectDropTarget(GetHwnd(), 0); TreeView_SelectDropTarget(GetHwnd(), 0);
} }
#endif // wxUSE_DRAGIMAGE
break; break;
} }
} }
@@ -2778,6 +2784,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
case TVN_BEGINDRAG: case TVN_BEGINDRAG:
case TVN_BEGINRDRAG: case TVN_BEGINRDRAG:
#if wxUSE_DRAGIMAGE
if ( event.IsAllowed() ) if ( event.IsAllowed() )
{ {
// normally this is impossible because the m_dragImage is // normally this is impossible because the m_dragImage is
@@ -2788,6 +2795,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
m_dragImage->BeginDrag(wxPoint(0,0), this); m_dragImage->BeginDrag(wxPoint(0,0), this);
m_dragImage->Show(); m_dragImage->Show();
} }
#endif // wxUSE_DRAGIMAGE
break; break;
case TVN_DELETEITEM: case TVN_DELETEITEM: