compilation fix for gcc 3.3

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

diff --git a/src/motif/scrolbar.cpp b/src/motif/scrolbar.cpp
index 5b19681cf389a3c095d49a802c4162fb09984cef..9c35d48ea3cbb704a5227b7301412ee7acc08266 100644 (file)
--- a/src/motif/scrolbar.cpp
+++ b/src/motif/scrolbar.cpp
@@ -40,6 +40,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 );


@@ -53,9 +54,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;
 }


@@ -125,6 +126,8 @@ static void wxScrollBarCallback(Widget widget, XtPointer clientData,
                                 XmScaleCallbackStruct *cbs)
 {
     wxScrollBar *scrollBar = (wxScrollBar*)wxGetWindowFromTable(widget);
                                 XmScaleCallbackStruct *cbs)
 {
     wxScrollBar *scrollBar = (wxScrollBar*)wxGetWindowFromTable(widget);

+    wxCHECK_RET( scrollBar, _T("invalid widget in scrollbar callback") );
+

     wxOrientation orientation = (wxOrientation)wxPtrToUInt(clientData);
     wxEventType eventType = wxEVT_NULL;
 
     wxOrientation orientation = (wxOrientation)wxPtrToUInt(clientData);
     wxEventType eventType = wxEVT_NULL;