From: Guillermo Rodriguez Garcia <guille@iies.es>
Date: Sun, 27 Feb 2000 05:06:09 +0000 (+0000)
Subject: Added support for wxSCROLL[WIN]_THUMBRELEASE events
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bdeca1d18cfeb8f47f7ca8339636594b6f1595fc

Added support for wxSCROLL[WIN]_THUMBRELEASE events


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/motif/scrolbar.cpp b/src/motif/scrolbar.cpp
index a6d1870345..655353e458 100644
--- a/src/motif/scrolbar.cpp
+++ b/src/motif/scrolbar.cpp
@@ -85,8 +85,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
     m_mainWidget = (Widget) scrollBarWidget;
 
-    // This will duplicate other events
-    //    XtAddCallback(scrollBarWidget, XmNvalueChangedCallback, (XtCallbackProc)wxScrollBarCallback, (XtPointer)this);
+    XtAddCallback(scrollBarWidget, XmNvalueChangedCallback, (XtCallbackProc)wxScrollBarCallback, (XtPointer)this);
     XtAddCallback(scrollBarWidget, XmNdragCallback, (XtCallbackProc)wxScrollBarCallback, (XtPointer)this);
     XtAddCallback(scrollBarWidget, XmNdecrementCallback, (XtCallbackProc)wxScrollBarCallback, (XtPointer)this);
     XtAddCallback(scrollBarWidget, XmNincrementCallback, (XtCallbackProc)wxScrollBarCallback, (XtPointer)this);
@@ -180,8 +179,8 @@ static void wxScrollBarCallback(Widget WXUNUSED(widget), XtPointer clientData,
                         XmScaleCallbackStruct *cbs)
 {
     wxScrollBar *scrollBar = (wxScrollBar *)clientData;
-
     wxEventType eventType = wxEVT_NULL;
+
     switch (cbs->reason)
     {
         case XmCR_INCREMENT:
@@ -201,9 +200,7 @@ static void wxScrollBarCallback(Widget WXUNUSED(widget), XtPointer clientData,
         }
         case XmCR_VALUE_CHANGED:
         {
-            // TODO: Should this be intercepted too, or will it cause
-            // duplicate events?
-            eventType = wxEVT_SCROLL_THUMBTRACK;
+            eventType = wxEVT_SCROLL_THUMBRELEASE;
             break;
         }
         case XmCR_PAGE_INCREMENT:
diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 204e0a0bff..f251d7492e 100644
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -446,7 +446,12 @@ wxWindow::~wxWindow()
         // or dialog is destroyed, but before that you may get some memory
         // leaks and potential layout problems if you delete and then add
         // child windows.
-        XtDestroyWidget((Widget) GetMainWidget());
+
+        // GRG, Feb/2000: commented this out when adding support for
+        //   wxSCROLL[WIN]_THUMBRELEASE events. Also it was reported
+        //   that this call crashed wxMotif under OS/2, so it seems
+        //   that leaving it out is the right thing to do.
+//        XtDestroyWidget((Widget) GetMainWidget());
         SetMainWidget((WXWidget) NULL);
     }
 }
@@ -469,7 +474,7 @@ void wxWindow::CreateScrollbar(wxOrientation orientation)
             xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
             XmNorientation, XmHORIZONTAL,
             NULL);
-        //      XtAddCallback (hScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
+        XtAddCallback (hScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
         XtAddCallback (hScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
         XtAddCallback (hScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
         XtAddCallback (hScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
@@ -505,7 +510,7 @@ void wxWindow::CreateScrollbar(wxOrientation orientation)
             xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
             XmNorientation, XmVERTICAL,
             NULL);
-        //      XtAddCallback (vScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
+        XtAddCallback (vScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
         XtAddCallback (vScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
         XtAddCallback (vScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
         XtAddCallback (vScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
@@ -2273,9 +2278,7 @@ static void wxScrollBarCallback(Widget scrollbar,
         }
     case XmCR_VALUE_CHANGED:
         {
-            // TODO: Should this be intercepted too, or will it cause
-            // duplicate events?
-            eventType = wxEVT_SCROLLWIN_THUMBTRACK;
+            eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
             break;
         }
     case XmCR_PAGE_INCREMENT: