Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for wxSCROLL[WIN]_THUMBRELEASE events

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
2000-02-27 05:06:09 +00:00
parent 7cd315c655
commit bdeca1d18c
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/motif/scrolbar.cpp
View File

@@ -85,8 +85,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
m_mainWidget = (Widget) scrollBarWidget; 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, XmNdragCallback, (XtCallbackProc)wxScrollBarCallback, (XtPointer)this);
XtAddCallback(scrollBarWidget, XmNdecrementCallback, (XtCallbackProc)wxScrollBarCallback, (XtPointer)this); XtAddCallback(scrollBarWidget, XmNdecrementCallback, (XtCallbackProc)wxScrollBarCallback, (XtPointer)this);
XtAddCallback(scrollBarWidget, XmNincrementCallback, (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) XmScaleCallbackStruct *cbs)
{ {
wxScrollBar *scrollBar = (wxScrollBar *)clientData; wxScrollBar *scrollBar = (wxScrollBar *)clientData;
wxEventType eventType = wxEVT_NULL; wxEventType eventType = wxEVT_NULL;
switch (cbs->reason) switch (cbs->reason)
{ {
case XmCR_INCREMENT: case XmCR_INCREMENT:
@@ -201,9 +200,7 @@ static void wxScrollBarCallback(Widget WXUNUSED(widget), XtPointer clientData,
} }
case XmCR_VALUE_CHANGED: case XmCR_VALUE_CHANGED:
{ {
// TODO: Should this be intercepted too, or will it cause eventType = wxEVT_SCROLL_THUMBRELEASE;
// duplicate events?
eventType = wxEVT_SCROLL_THUMBTRACK;
break; break;
} }
case XmCR_PAGE_INCREMENT: case XmCR_PAGE_INCREMENT:

15
src/motif/window.cpp
View File

@@ -446,7 +446,12 @@ wxWindow::~wxWindow()
// or dialog is destroyed, but before that you may get some memory // or dialog is destroyed, but before that you may get some memory
// leaks and potential layout problems if you delete and then add // leaks and potential layout problems if you delete and then add
// child windows. // 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); SetMainWidget((WXWidget) NULL);
} }
} }
@@ -469,7 +474,7 @@ void wxWindow::CreateScrollbar(wxOrientation orientation)
xmScrollBarWidgetClass, (Widget) m_scrolledWindow, xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
XmNorientation, XmHORIZONTAL, XmNorientation, XmHORIZONTAL,
NULL); NULL);
// XtAddCallback (hScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL); XtAddCallback (hScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
XtAddCallback (hScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL); XtAddCallback (hScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
XtAddCallback (hScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL); XtAddCallback (hScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
XtAddCallback (hScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL); XtAddCallback (hScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
@@ -505,7 +510,7 @@ void wxWindow::CreateScrollbar(wxOrientation orientation)
xmScrollBarWidgetClass, (Widget) m_scrolledWindow, xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
XmNorientation, XmVERTICAL, XmNorientation, XmVERTICAL,
NULL); NULL);
// XtAddCallback (vScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL); XtAddCallback (vScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
XtAddCallback (vScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL); XtAddCallback (vScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
XtAddCallback (vScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL); XtAddCallback (vScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
XtAddCallback (vScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL); XtAddCallback (vScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
@@ -2273,9 +2278,7 @@ static void wxScrollBarCallback(Widget scrollbar,
} }
case XmCR_VALUE_CHANGED: case XmCR_VALUE_CHANGED:
{ {
// TODO: Should this be intercepted too, or will it cause eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
// duplicate events?
eventType = wxEVT_SCROLLWIN_THUMBTRACK;
break; break;
} }
case XmCR_PAGE_INCREMENT: case XmCR_PAGE_INCREMENT: