[DO NOT MERGE] GTK: Fix early exit from wxDropSource::DoDragDrop

include/wx/dnd.h

@@ -95,7 +95,6 @@ class WXDLLIMPEXP_CORE wxDropSourceBase
     // give the default feedback
     virtual bool GiveFeedback(wxDragResult WXUNUSED(effect)) { return false; }
 
-protected:
     const wxCursor& GetCursor(wxDragResult res) const
     {
         if ( res == wxDragCopy )
@@ -105,7 +104,8 @@ class WXDLLIMPEXP_CORE wxDropSourceBase
         else
             return m_cursorStop;
     }
-
+
+protected:
     // the data we're dragging
     wxDataObject *m_data;
 

include/wx/generic/headerctrlg.h

@@ -52,6 +52,12 @@ class WXDLLIMPEXP_CORE wxHeaderCtrl : public wxHeaderCtrlBase
 
 
 private:
+	enum class Region{
+		NoWhere,
+		LeftHalf,
+		RightHalf,
+		Separator
+	};
     // implement base class pure virtuals
     virtual void DoSetCount(unsigned int count) wxOVERRIDE;
     virtual unsigned int DoGetCount() const wxOVERRIDE;
@@ -96,11 +102,14 @@ class WXDLLIMPEXP_CORE wxHeaderCtrl : public wxHeaderCtrlBase
     // position is near the divider at the right end of this column (notice
     // that this means that we return column 0 even if the position is over
     // column 1 but close enough to the divider separating it from column 0)
-    unsigned int FindColumnAtPoint(int x, bool *onSeparator = NULL) const;
+    unsigned int FindColumnAtPoint(int x, Region& pos_region) const;
 
     // return the result of FindColumnAtPoint() if it is a valid column,
     // otherwise the index of the last (rightmost) displayed column
-    unsigned int FindColumnClosestToPoint(int xPhysical) const;
+    unsigned int FindColumnClosestToPoint(int xPhysical, Region& pos_region) const;
+
+    unsigned int FindColumnAfter(const unsigned int column_idx) const;
+    unsigned int FindColumnBefore(const unsigned int column_idx) const;
 
     // return true if a drag resizing operation is currently in progress
     bool IsResizing() const;

include/wx/osx/cocoa/private/dnd.h

@@ -0,0 +1,36 @@
+#include "wx/wxprec.h"
+
+#if wxUSE_DRAG_AND_DROP || wxUSE_CLIPBOARD
+
+#ifndef WX_PRECOMP
+#include "wx/object.h"
+#endif
+
+#include "wx/dnd.h"
+
+#include "wx/osx/private.h"
+#include "wx/osx/private/datatransfer.h"
+
+@interface DropSourceDelegate : NSObject<NSDraggingSource>
+{
+    BOOL dragFinished;
+    int resultCode;
+    wxDropSource* impl;
+
+    // Flags for drag and drop operations (wxDrag_* ).
+    int m_dragFlags;
+    NSImage* m_copy_cursor;
+    NSImage* m_move_cursor;
+    NSImage* m_none_cursor;
+}
+
+- (void)setImplementation:(nonnull wxDropSource *)dropSource flags:(int)flags;
+- (BOOL)finished;
+- (NSDragOperation)code;
+- (NSDragOperation)draggingSession:(nonnull NSDraggingSession *)session sourceOperationMaskForDraggingContext:(NSDraggingContext)context;
+- (void)draggedImage:(nonnull NSImage *)anImage movedTo:(NSPoint)aPoint;
+- (void)draggedImage:(nonnull NSImage *)anImage endedAt:(NSPoint)aPoint operation:(NSDragOperation)operation;
+- (nullable NSImage*)cursorForStatus:(wxDragResult)status;
+@end
+
+#endif

include/wx/window.h

@@ -49,6 +49,12 @@
     #define wxUSE_MENUS_NATIVE wxUSE_MENUS
 #endif // __WXUNIVERSAL__/!__WXUNIVERSAL__
 
+#ifdef __WXGTK__
+namespace CMExtension {
+    extern bool g_need_traditional_scrollbar;
+}
+#endif
+
 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------

src/common/popupcmn.cpp

@@ -451,19 +451,23 @@ void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
 
     if (IsShown() && m_child)
     {
-        // Store the last mouse position to minimize the number of calls to
-        // wxFindWindowAtPoint() which are quite expensive.
+        // Store the last mouse position
         static wxPoint s_posLast;
         const wxPoint pos = wxGetMousePosition();
         if ( pos != s_posLast )
         {
             s_posLast = pos;
-
-            wxWindow* const winUnderMouse = wxFindWindowAtPoint(pos);
+
+            // DO NOT use wxFindWindowAtPoint() because if there're multiple top level windows,
+            // it will 'Find the deepest window at the given mouse position in screen coordinates', 
+            // which is not the right one for this logic.
+            auto screen_rect = GetScreenRect();
+            const auto mouse_within_me = (pos.x >= screen_rect.GetTopLeft().x and pos.y >= screen_rect.GetTopLeft().y and
+                pos.x <= screen_rect.GetBottomRight().x and pos.y <= screen_rect.GetBottomRight().y);
 
             // We release the mouse capture while the mouse is inside the popup
             // itself to allow using it normally with the controls inside it.
-            if ( wxGetTopLevelParent(winUnderMouse) == this )
+            if ( mouse_within_me )
             {
                 if ( m_child->HasCapture() )
                 {