X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8680e3e0e5066d35a8f4fd43294ba4bfcaf4ba7..1c3a6972f471bd792eb8d812049c68bccd56a2a9:/src/motif/scrolbar.cpp

diff --git a/src/motif/scrolbar.cpp b/src/motif/scrolbar.cpp
index c882178a53..ff018e26b2 100644
--- a/src/motif/scrolbar.cpp
+++ b/src/motif/scrolbar.cpp
@@ -9,20 +9,18 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "scrolbar.h"
 #endif
 
 #include "wx/defs.h"
-
 #include "wx/scrolbar.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint
+#define XtDisplay XTDISPLAY
 #endif
-#include <X11/IntrinsicP.h>
 #include <Xm/Xm.h>
-#include <Xm/RowColumn.h>
 #include <Xm/ScrollBar.h>
 #ifdef __VMS__
 #pragma message enable nosimpint
@@ -42,64 +40,26 @@ 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;
 
-    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 );
 
-    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, x, y, width, height);
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
+                  pos.x, pos.y, newSize.x, newSize.y);
     ChangeBackgroundColour();
 
-    return TRUE;
+    return true;
 }
 
 wxScrollBar::~wxScrollBar()
@@ -108,25 +68,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,
@@ -171,15 +123,11 @@ void wxScrollBar::ChangeBackgroundColour()
         NULL);
 }
 
-void wxScrollBar::ChangeForegroundColour()
-{
-    wxWindow::ChangeForegroundColour();
-}
-
-static void wxScrollBarCallback(Widget WXUNUSED(widget), XtPointer clientData,
-                        XmScaleCallbackStruct *cbs)
+static void wxScrollBarCallback(Widget widget, XtPointer clientData,
+                                XmScaleCallbackStruct *cbs)
 {
-    wxScrollBar *scrollBar = (wxScrollBar *)clientData;
+    wxScrollBar *scrollBar = (wxScrollBar*)wxGetWindowFromTable(widget);
+    wxOrientation orientation = (wxOrientation)(int)clientData;
     wxEventType eventType = wxEVT_NULL;
 
     switch (cbs->reason)
@@ -232,13 +180,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);
-*/
 }
-