From d01839c89d6bee180d5d446ea55a8560d1c5c6ac Mon Sep 17 00:00:00 2001
From: LRN1986 <LRN1986@47890b92-0858-11df-a26f-8b716316a5bc>
Date: Sat, 24 Apr 2010 13:18:59 +0000
Subject: [PATCH] ExtImport: Fix drag'n'drop Plugin reordering on Linux

wxCustomFindItem() function is now used only on Windows
where it is necessary, because wxListCtrl::HitTest() is
broken here.
---
 src/prefs/ExtImportPrefs.cpp | 78 ++++++++++++++++++++----------------
 1 file changed, 43 insertions(+), 35 deletions(-)

diff --git a/src/prefs/ExtImportPrefs.cpp b/src/prefs/ExtImportPrefs.cpp
index cb1a41a7a..489e22296 100644
--- a/src/prefs/ExtImportPrefs.cpp
+++ b/src/prefs/ExtImportPrefs.cpp
@@ -651,41 +651,12 @@ wxDragResult ExtImportPrefsDropTarget::OnData(wxCoord x, wxCoord y,
    return def;
 }
 
-bool ExtImportPrefsDropTarget::OnDrop(wxCoord x, wxCoord y)
-{
-   if (mPrefs == NULL)
-      return false;
-   wxListCtrl *PluginList = mPrefs->GetPluginList();
-   Grid *RuleTable = mPrefs->GetRuleTable();
-   if (mPrefs->GetDragFocus() == RuleTable)
-   {
-      if (RuleTable->YToRow (y -
-            RuleTable->GetColLabelSize ()) == wxNOT_FOUND)
-         return false;
-   }
-   else if (mPrefs->GetDragFocus() == PluginList)
-   {
-      long item = PluginList->FindItem (-1, wxPoint (x, y), 0);
-      if (item >= 0)
-      {
-         wxRect r;
-         PluginList->GetItemRect (item, r);
-         if (!r.Contains(x, y))
-            return false;
-      }
-   }
-   
-   return true;
-}
-
-wxDragResult ExtImportPrefsDropTarget::OnEnter(wxCoord x, wxCoord y,
-      wxDragResult def)
-{
-   return OnDragOver(x, y, def);
-}
-
+#if defined(__WXMSW__)
 /* wxListCtrl::FindItem() in wxPoint()-taking mode works only for lists in
  * Small/Large-icon mode
+ * wxListCtrl::HitTest() on Windows only hits item label rather than its whole
+ * row, which makes it difficult to drag over items with short or non-existent
+ * labels.
  */
 long wxCustomFindItem(wxListCtrl *list, int x, int y)
 {
@@ -701,6 +672,40 @@ long wxCustomFindItem(wxListCtrl *list, int x, int y)
    }
    return -1;
 }
+#endif
+
+bool ExtImportPrefsDropTarget::OnDrop(wxCoord x, wxCoord y)
+{
+   if (mPrefs == NULL)
+      return false;
+   wxListCtrl *PluginList = mPrefs->GetPluginList();
+   Grid *RuleTable = mPrefs->GetRuleTable();
+   if (mPrefs->GetDragFocus() == RuleTable)
+   {
+      if (RuleTable->YToRow (y -
+            RuleTable->GetColLabelSize ()) == wxNOT_FOUND)
+         return false;
+   }
+   else if (mPrefs->GetDragFocus() == PluginList)
+   {
+#if defined(__WXMSW__)
+      long item = wxCustomFindItem (PluginList, x, y);
+#else
+      int flags = 0;
+      long item = PluginList->HitTest (wxPoint (x, y), flags, NULL);
+#endif
+      if (item < 0)
+         return false;
+   }
+   
+   return true;
+}
+
+wxDragResult ExtImportPrefsDropTarget::OnEnter(wxCoord x, wxCoord y,
+      wxDragResult def)
+{
+   return OnDragOver(x, y, def);
+}
 
 wxDragResult ExtImportPrefsDropTarget::OnDragOver(wxCoord x, wxCoord y,
       wxDragResult def)
@@ -728,9 +733,12 @@ wxDragResult ExtImportPrefsDropTarget::OnDragOver(wxCoord x, wxCoord y,
    }
    else if (mPrefs->GetDragFocus() == PluginList)
    {
-      wxRect r;
+#if defined(__WXMSW__)
       long item = wxCustomFindItem (PluginList, x, y);
-      
+#else
+      int flags = 0;
+      long item = PluginList->HitTest (wxPoint (x, y), flags, NULL);
+#endif
       if (item < 0)
          return wxDragNone;