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