conversion corrections

[wxWidgets.git] / src / mac / carbon / scrolbar.cpp

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index eef2a84c54ba8d7c7e22defdbbce4e5dbe0d16af..3b08c25ecccd30e61c82e8e4cacf4cf92d2b7982 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -40,24 +40,25 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

-  if (!parent)
-      return FALSE;
-    
+    if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
+        return FALSE;
+

     Rect bounds ;
     Str255 title ;
     Rect bounds ;
     Str255 title ;

-    
+

     MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, validator , name , &bounds , title ) ;
 
     MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, validator , name , &bounds , title ) ;
 

-    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , true , 0 , 0 , 100, 
-        kControlScrollBarLiveProc , (long) this ) ;
-    
+    m_macControl = ::NewControl(MAC_WXHWND(parent->MacGetRootWindow()) ,
+                                &bounds , title , false , 0 , 0 , 100, 
+                                kControlScrollBarLiveProc , (long) this) ;
+

     wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;
 
     ::SetControlAction( (ControlHandle) m_macControl , wxMacLiveScrollbarActionUPP ) ;
 
     MacPostControlCreate() ;
 
     wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;
 
     ::SetControlAction( (ControlHandle) m_macControl , wxMacLiveScrollbarActionUPP ) ;
 
     MacPostControlCreate() ;
 

-  return TRUE;
+    return TRUE;

 }
 
 wxScrollBar::~wxScrollBar()
 }
 
 wxScrollBar::~wxScrollBar()


@@ -115,7 +116,7 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart
     int maxPos = GetControl32BitMaximum( (ControlHandle) m_macControl) ;
     
     wxEventType scrollEvent = wxEVT_NULL;
     int maxPos = GetControl32BitMaximum( (ControlHandle) m_macControl) ;
     
     wxEventType scrollEvent = wxEVT_NULL;

-    int nScrollInc;
+    int nScrollInc = 0;

     
     // all events have already been reported during mouse down, except for THUMBRELEASE
     if ( !mouseStillDown && controlpart !=kControlIndicatorPart )
     
     // all events have already been reported during mouse down, except for THUMBRELEASE
     if ( !mouseStillDown && controlpart !=kControlIndicatorPart )