corrected initialization of private wxBitmapHandler members in wxPICTResourceHandler...

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

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index 08818c04704638f12cb8124264fac6f8bd814775..4dd6127cfb8369a2cf62dfecfcd440798609ac36 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -9,11 +9,11 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "scrolbar.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
@@ -47,8 +47,10 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
 
+    m_peer = new wxMacControl() ;
     verify_noerr ( CreateScrollBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 
-    0 , 0 , 100 , 1 , true /* liveTracking */ , wxMacLiveScrollbarActionUPP , (ControlRef*) &m_macControl ) ) ;
+    0 , 0 , 100 , 1 , true /* liveTracking */ , wxMacLiveScrollbarActionUPP , m_peer->GetControlRefAddr() ) );
+    
 
     MacPostControlCreate(pos,size) ;
 
@@ -61,12 +63,12 @@ wxScrollBar::~wxScrollBar()
 
 void wxScrollBar::SetThumbPosition(int viewStart)
 {
-    ::SetControl32BitValue( (ControlRef) m_macControl , viewStart ) ;
+    m_peer->SetValue( viewStart ) ;
 }
 
 int wxScrollBar::GetThumbPosition() const
 {
-    return ::GetControl32BitValue( (ControlRef) m_macControl ) ;
+    return m_peer->GetValue() ;
 }
 
 void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
@@ -78,10 +80,10 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
 
    int range1 = wxMax((m_objectSize - m_viewSize), 0) ;
 
-    SetControl32BitMaximum( (ControlRef) m_macControl , range1 ) ;
-    SetControl32BitMinimum( (ControlRef) m_macControl , 0 ) ;
-    SetControl32BitValue( (ControlRef) m_macControl , position ) ;
-    SetControlViewSize( (ControlRef) m_macControl , m_viewSize ) ;
+    m_peer->SetMaximum( range1 ) ;
+    m_peer->SetMinimum( 0 ) ;
+    m_peer->SetValue( position ) ;
+    m_peer->SetViewSize( m_viewSize ) ;
 
     if ( refresh )
       MacRedrawControl() ;
@@ -90,15 +92,15 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
 
 void wxScrollBar::Command(wxCommandEvent& event)
 {
-    SetThumbPosition(event.m_commandInt);
+    SetThumbPosition(event.GetInt());
     ProcessCommand(event);
 }
 
 void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) 
 {
-    int position = GetControl32BitValue( (ControlRef) m_macControl) ;
-    int minPos = GetControl32BitMinimum( (ControlRef) m_macControl) ;
-    int maxPos = GetControl32BitMaximum( (ControlRef) m_macControl) ;
+    int position = m_peer->GetValue() ;
+    int minPos = m_peer->GetMinimum() ;
+    int maxPos = m_peer->GetMaximum() ;
     
     wxEventType scrollEvent = wxEVT_NULL;
     int nScrollInc = 0;
@@ -169,9 +171,9 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart
 
 wxInt32 wxScrollBar::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent ) 
 {
-    int position = GetControl32BitValue( (ControlRef) m_macControl) ;
-    int minPos = GetControl32BitMinimum( (ControlRef) m_macControl) ;
-    int maxPos = GetControl32BitMaximum( (ControlRef) m_macControl) ;
+    int position = m_peer->GetValue() ;
+    int minPos = m_peer->GetMinimum() ;
+    int maxPos = m_peer->GetMaximum() ;
     
     wxEventType scrollEvent = wxEVT_NULL;
     int nScrollInc = 0;