forgot to commit ...

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

diff --git a/src/motif/scrolbar.cpp b/src/motif/scrolbar.cpp
index bb3f97a8d24262bd4506ade89412a5af3da16c89..3b53a731df98cb44c38e6b507b288c48f3d36026 100644 (file)
--- 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:
 // Purpose:     wxScrollBar
 // Author:      Julian Smart
 // Modified by:


@@ -9,19 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "scrolbar.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"

 #include "wx/scrolbar.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint
 #include "wx/scrolbar.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint

-#define XtDisplay XTDISPLAY

 #endif
 #include <Xm/Xm.h>
 #include <Xm/ScrollBar.h>
 #endif
 #include <Xm/Xm.h>
 #include <Xm/ScrollBar.h>


@@ -34,8 +28,6 @@
 static void wxScrollBarCallback(Widget widget, XtPointer clientData,
                         XmScaleCallbackStruct *cbs);
 
 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,
 // Scrollbar
 bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,


@@ -45,6 +37,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 {
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
         return false;
 {
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
         return false;

+    PreCreation();

 
     wxSize newSize =
         ( style & wxHORIZONTAL ) ? wxSize( 140, 16 ) : wxSize( 16, 140 );
 
     wxSize newSize =
         ( style & wxHORIZONTAL ) ? wxSize( 140, 16 ) : wxSize( 16, 140 );


@@ -58,9 +51,9 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
                            (wxOrientation)(style & (wxHORIZONTAL|wxVERTICAL)),
                            (void (*)())wxScrollBarCallback );
 
                            (wxOrientation)(style & (wxHORIZONTAL|wxVERTICAL)),
                            (void (*)())wxScrollBarCallback );
 

+    PostCreation();

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

-    ChangeBackgroundColour();

 
     return true;
 }
 
     return true;
 }


@@ -130,7 +123,9 @@ static void wxScrollBarCallback(Widget widget, XtPointer clientData,
                                 XmScaleCallbackStruct *cbs)
 {
     wxScrollBar *scrollBar = (wxScrollBar*)wxGetWindowFromTable(widget);
                                 XmScaleCallbackStruct *cbs)
 {
     wxScrollBar *scrollBar = (wxScrollBar*)wxGetWindowFromTable(widget);

-    wxOrientation orientation = (wxOrientation)(int)clientData;
+    wxCHECK_RET( scrollBar, wxT("invalid widget in scrollbar callback") );
+
+    wxOrientation orientation = (wxOrientation)wxPtrToUInt(clientData);

     wxEventType eventType = wxEVT_NULL;
 
     switch (cbs->reason)
     wxEventType eventType = wxEVT_NULL;
 
     switch (cbs->reason)


@@ -186,5 +181,5 @@ static void wxScrollBarCallback(Widget widget, XtPointer clientData,
     wxScrollEvent event(eventType, scrollBar->GetId(),
                         cbs->value, orientation);
     event.SetEventObject(scrollBar);
     wxScrollEvent event(eventType, scrollBar->GetId(),
                         cbs->value, orientation);
     event.SetEventObject(scrollBar);

-    scrollBar->GetEventHandler()->ProcessEvent(event);
+    scrollBar->HandleWindowEvent(event);

 }
 }