applied part of patch 1169925: fix errors with multibyte <-> wx conversions

[wxWidgets.git] / src / motif / slider.cpp

diff --git a/src/motif/slider.cpp b/src/motif/slider.cpp
index 0cf3134f88cea3bce325046c1ddc05b91731cf2a..4d32280ae4dd804c08833c68b4abf5bc98c39c71 100644 (file)
--- a/src/motif/slider.cpp
+++ b/src/motif/slider.cpp
@@ -6,13 +6,20 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "slider.h"
 #endif
 
 #pragma implementation "slider.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/defs.h"
+
+#if wxUSE_SLIDER
+

 #include "wx/slider.h"
 #include "wx/utils.h"
 
 #include "wx/slider.h"
 #include "wx/utils.h"
 


@@ -103,13 +110,12 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 
     XtAddCallback (sliderWidget, XmNdragCallback, (XtCallbackProc) wxSliderCallback, (XtPointer) this);
 
 
     XtAddCallback (sliderWidget, XmNdragCallback, (XtCallbackProc) wxSliderCallback, (XtPointer) this);
 

-    ChangeFont(FALSE);
-    SetCanAddEventHandler(TRUE);
+    ChangeFont(false);

     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 
     ChangeBackgroundColour();
 
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 
     ChangeBackgroundColour();
 

-    return TRUE;
+    return true;

 }
 
 wxSlider::~wxSlider()
 }
 
 wxSlider::~wxSlider()


@@ -229,7 +235,9 @@ void wxSliderCallback (Widget widget, XtPointer clientData,
     }
 
     wxScrollEvent event(scrollEvent, slider->GetId());
     }
 
     wxScrollEvent event(scrollEvent, slider->GetId());

-    XtVaGetValues (widget, XmNvalue, &event.m_commandInt, NULL);
+    int commandInt = event.GetInt();
+    XtVaGetValues (widget, XmNvalue, &commandInt, NULL);
+    event.SetInt(commandInt);

     event.SetEventObject(slider);
     slider->GetEventHandler()->ProcessEvent(event);
 
     event.SetEventObject(slider);
     slider->GetEventHandler()->ProcessEvent(event);
 


@@ -240,3 +248,4 @@ void wxSliderCallback (Widget widget, XtPointer clientData,
     slider->GetEventHandler()->ProcessEvent(event2);
 }
 
     slider->GetEventHandler()->ProcessEvent(event2);
 }
 

+#endif // wxUSE_SLIDER