X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bdeca1d18cfeb8f47f7ca8339636594b6f1595fc..13b4df952c77383f50696e51fcbaa2d8bbd3b3b9:/src/motif/scrolbar.cpp?ds=sidebyside diff --git a/src/motif/scrolbar.cpp b/src/motif/scrolbar.cpp index 655353e458..3b53a731df 100644 --- a/src/motif/scrolbar.cpp +++ b/src/motif/scrolbar.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: scrolbar.cpp +// Name: src/motif/scrolbar.cpp // Purpose: wxScrollBar // Author: Julian Smart // Modified by: @@ -9,18 +9,15 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "scrolbar.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/scrolbar.h" #ifdef __VMS__ #pragma message disable nosimpint #endif -#include #include -#include #include #ifdef __VMS__ #pragma message enable nosimpint @@ -31,8 +28,6 @@ static void wxScrollBarCallback(Widget widget, XtPointer clientData, XmScaleCallbackStruct *cbs); -IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl) - // Scrollbar bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, @@ -40,65 +35,27 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { - if (!parent) - return FALSE; - parent->AddChild(this); - SetName(name); - m_backgroundColour = parent->GetBackgroundColour(); - m_foregroundColour = parent->GetForegroundColour(); - SetValidator(validator); - - m_windowStyle = style; - - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; - - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; - - if (width == -1) - { - if (style & wxHORIZONTAL) - width = 140; - else - width = 12; - } - if (height == -1) - { - if (style & wxVERTICAL) - height = 140; - else - height = 12; - } - - Widget parentWidget = (Widget) parent->GetClientWidget(); - int direction = (style & wxHORIZONTAL) ? XmHORIZONTAL: XmVERTICAL; + if( !CreateControl( parent, id, pos, size, style, validator, name ) ) + return false; + PreCreation(); - Widget scrollBarWidget = XtVaCreateManagedWidget("scrollBarWidget", - xmScrollBarWidgetClass, parentWidget, - XmNorientation, direction, - NULL); + wxSize newSize = + ( style & wxHORIZONTAL ) ? wxSize( 140, 16 ) : wxSize( 16, 140 ); + if( size.x != -1 ) newSize.x = size.x; + if( size.y != -1 ) newSize.y = size.y; - m_mainWidget = (Widget) scrollBarWidget; + Widget parentWidget = (Widget) parent->GetClientWidget(); - 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); - XtAddCallback(scrollBarWidget, XmNpageDecrementCallback, (XtCallbackProc)wxScrollBarCallback, (XtPointer)this); - XtAddCallback(scrollBarWidget, XmNpageIncrementCallback, (XtCallbackProc)wxScrollBarCallback, (XtPointer)this); - XtAddCallback(scrollBarWidget, XmNtoTopCallback, (XtCallbackProc)wxScrollBarCallback, (XtPointer)this); - XtAddCallback(scrollBarWidget, XmNtoBottomCallback, (XtCallbackProc)wxScrollBarCallback, (XtPointer)this); + m_mainWidget = + DoCreateScrollBar( (WXWidget)parentWidget, + (wxOrientation)(style & (wxHORIZONTAL|wxVERTICAL)), + (void (*)())wxScrollBarCallback ); - SetCanAddEventHandler(TRUE); - AttachWidget (parent, m_mainWidget, (WXWidget) NULL, x, y, width, height); - ChangeBackgroundColour(); + PostCreation(); + AttachWidget (parent, m_mainWidget, (WXWidget) NULL, + pos.x, pos.y, newSize.x, newSize.y); - return TRUE; + return true; } wxScrollBar::~wxScrollBar() @@ -107,25 +64,17 @@ wxScrollBar::~wxScrollBar() void wxScrollBar::SetThumbPosition(int pos) { - if (m_mainWidget) - { - XtVaSetValues ((Widget) m_mainWidget, - XmNvalue, pos, - NULL); - } + XtVaSetValues ((Widget) m_mainWidget, + XmNvalue, pos, + NULL); } int wxScrollBar::GetThumbPosition() const { - if (m_mainWidget) - { - int pos; - XtVaGetValues((Widget) m_mainWidget, - XmNvalue, &pos, NULL); - return pos; - } - else - return 0; + int pos; + XtVaGetValues((Widget) m_mainWidget, + XmNvalue, &pos, NULL); + return pos; } void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize, @@ -151,7 +100,7 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS void wxScrollBar::Command(wxCommandEvent& event) { - SetThumbPosition(event.m_commandInt); + SetThumbPosition(event.GetInt()); ProcessCommand(event); } @@ -170,15 +119,13 @@ void wxScrollBar::ChangeBackgroundColour() NULL); } -void wxScrollBar::ChangeForegroundColour() +static void wxScrollBarCallback(Widget widget, XtPointer clientData, + XmScaleCallbackStruct *cbs) { - wxWindow::ChangeForegroundColour(); -} + wxScrollBar *scrollBar = (wxScrollBar*)wxGetWindowFromTable(widget); + wxCHECK_RET( scrollBar, wxT("invalid widget in scrollbar callback") ); -static void wxScrollBarCallback(Widget WXUNUSED(widget), XtPointer clientData, - XmScaleCallbackStruct *cbs) -{ - wxScrollBar *scrollBar = (wxScrollBar *)clientData; + wxOrientation orientation = (wxOrientation)wxPtrToUInt(clientData); wxEventType eventType = wxEVT_NULL; switch (cbs->reason) @@ -231,13 +178,8 @@ static void wxScrollBarCallback(Widget WXUNUSED(widget), XtPointer clientData, } } - wxScrollEvent event(eventType, scrollBar->GetId()); + wxScrollEvent event(eventType, scrollBar->GetId(), + cbs->value, orientation); event.SetEventObject(scrollBar); - event.SetPosition(cbs->value); - scrollBar->GetEventHandler()->ProcessEvent(event); -/* - if (!scrollBar->inSetValue) - scrollBar->ProcessCommand(event); -*/ + scrollBar->HandleWindowEvent(event); } -