From 52ed888d2a47a3fc19ec691ddfa4cf6e72fa0632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 11 Apr 2011 15:07:08 +0200 Subject: [PATCH] wxTreeItemId needs to be initialized with long int --- src/plugins/contrib/codesnippets/codesnippets.cpp | 12 ++++++------ .../contrib/codesnippets/codesnippetstreectrl.cpp | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/plugins/contrib/codesnippets/codesnippets.cpp b/src/plugins/contrib/codesnippets/codesnippets.cpp index 0b138db..43ddb95 100644 --- a/src/plugins/contrib/codesnippets/codesnippets.cpp +++ b/src/plugins/contrib/codesnippets/codesnippets.cpp @@ -96,7 +96,7 @@ CodeSnippets::CodeSnippets() m_MouseDownX = m_MouseDownY = 0; m_MouseUpX = m_MouseUpY = 0; #if !wxCHECK_VERSION(2, 8, 12) - m_prjTreeItemAtKeyUp = m_prjTreeItemAtKeyDown= 0; + m_prjTreeItemAtKeyUp = m_prjTreeItemAtKeyDown= 0L; #endif m_bMouseExitedWindow = false; m_bBeginInternalDrag = false; @@ -1232,8 +1232,8 @@ void CodeSnippets::OnPrjTreeMouseLeftDownEvent(wxMouseEvent& event) m_MouseDownY = event.GetY(); #if !wxCHECK_VERSION(2, 8, 12) - m_prjTreeItemAtKeyDown = 0; - m_prjTreeItemAtKeyUp = 0; + m_prjTreeItemAtKeyDown = 0L; + m_prjTreeItemAtKeyUp = 0L; #endif int hitFlags = 0; @@ -1264,7 +1264,7 @@ void CodeSnippets::OnPrjTreeMouseLeftUpEvent(wxMouseEvent& event) m_MouseUpY = event.GetY(); #if !wxCHECK_VERSION(2, 8, 12) - m_prjTreeItemAtKeyUp = 0; + m_prjTreeItemAtKeyUp = 0L; #endif int hitFlags = 0; @@ -1442,8 +1442,8 @@ void CodeSnippets::DoPrjTreeExternalDrag(wxTreeCtrl* pTree) delete fileData; //wxFileDataObject m_TreeText = wxEmptyString; #if !wxCHECK_VERSION(2, 8, 12) - m_prjTreeItemAtKeyDown = 0; - m_prjTreeItemAtKeyUp = 0; + m_prjTreeItemAtKeyDown = 0L; + m_prjTreeItemAtKeyUp = 0L; #endif // correct for treeCtrl bug diff --git a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp index 65e6af5..b24dce1 100644 --- a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp +++ b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp @@ -95,7 +95,7 @@ CodeSnippetsTreeCtrl::CodeSnippetsTreeCtrl(wxWindow *parent, const wxWindowID id m_bBeginInternalDrag = false; m_LastXmlModifiedTime = time_t(0); //2009/03/15 #if !wxCHECK_VERSION(2, 8, 12) - m_itemAtKeyUp = m_itemAtKeyDown = 0; + m_itemAtKeyUp = m_itemAtKeyDown = 0L; #endif @@ -1073,8 +1073,8 @@ void CodeSnippetsTreeCtrl::EndInternalTreeItemDrag() delete pDoc; pDoc = 0; #if !wxCHECK_VERSION(2, 8, 12) - m_itemAtKeyDown = 0; - m_itemAtKeyUp = 0; + m_itemAtKeyDown = 0L; + m_itemAtKeyUp = 0L; #endif return; @@ -1296,8 +1296,8 @@ void CodeSnippetsTreeCtrl::FinishExternalDrag() delete fileData; //wxFileDataObject m_TreeText = wxEmptyString; #if !wxCHECK_VERSION(2, 8, 12) - m_itemAtKeyDown = 0; - m_itemAtKeyUp = 0; + m_itemAtKeyDown = 0L; + m_itemAtKeyUp = 0L; #endif } @@ -1410,7 +1410,7 @@ void CodeSnippetsTreeCtrl::OnEndTreeItemDrag(wxTreeEvent& event) m_MouseUpY = event.GetPoint().y; #if !wxCHECK_VERSION(2, 8, 12) - m_itemAtKeyUp = 0; + m_itemAtKeyUp = 0L; #endif int hitFlags = 0; wxTreeItemId id = HitTest(wxPoint(m_MouseUpX, m_MouseUpY), hitFlags); -- 1.7.7.6