Check for invalid items in generic wxDataViewCtrl::GetSelections().

[wxWidgets.git] / src / osx / scrolbar_osx.cpp

diff --git a/src/osx/scrolbar_osx.cpp b/src/osx/scrolbar_osx.cpp
index 3842de56865884b74c4c00187c4c2d99655cc4a9..9b71f0e436eb98a4f74763284be8bec2e556a2e0 100644 (file)
--- a/src/osx/scrolbar_osx.cpp
+++ b/src/osx/scrolbar_osx.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/osx/carbon/scrolbar.cpp
+// Name:        src/osx/scrolbar_osx.cpp

 // Purpose:     wxScrollBar
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxScrollBar
 // Author:      Stefan Csomor
 // Modified by:


@@ -34,13 +34,13 @@ bool wxScrollBar::Create( wxWindow *parent,
     long style,
     const wxValidator& validator,
     const wxString& name )
     long style,
     const wxValidator& validator,
     const wxString& name )

-{
-    m_macIsUserPane = false;
-
+{    
+    DontCreatePeer();
+    

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

-    m_peer = wxWidgetImpl::CreateScrollBar( this, parent, id, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateScrollBar( this, parent, id, pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate( pos, size );
 
 
     MacPostControlCreate( pos, size );
 


@@ -53,12 +53,12 @@ wxScrollBar::~wxScrollBar()
 
 void wxScrollBar::SetThumbPosition( int viewStart )
 {
 
 void wxScrollBar::SetThumbPosition( int viewStart )
 {

-    m_peer->SetScrollThumb( viewStart, m_viewSize );
+    GetPeer()->SetScrollThumb( viewStart, m_viewSize );

 }
 
 int wxScrollBar::GetThumbPosition() const
 {
 }
 
 int wxScrollBar::GetThumbPosition() const
 {

-    return m_peer->GetValue();
+    return GetPeer()->GetValue();

 }
 
 void wxScrollBar::SetScrollbar( int position,
 }
 
 void wxScrollBar::SetScrollbar( int position,


@@ -73,8 +73,8 @@ void wxScrollBar::SetScrollbar( int position,
 
    int range1 = wxMax( (m_objectSize - m_viewSize), 0 );
 
 
    int range1 = wxMax( (m_objectSize - m_viewSize), 0 );
 

-   m_peer->SetMaximum( range1 );
-   m_peer->SetScrollThumb( position, m_viewSize );
+   GetPeer()->SetMaximum( range1 );
+   GetPeer()->SetScrollThumb( position, m_viewSize );

 }
 
 void wxScrollBar::Command( wxCommandEvent& event )
 }
 
 void wxScrollBar::Command( wxCommandEvent& event )


@@ -85,7 +85,7 @@ void wxScrollBar::Command( wxCommandEvent& event )
 
 bool wxScrollBar::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
 
 bool wxScrollBar::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {

-    int new_pos = m_peer->GetValue();
+    int new_pos = GetPeer()->GetValue();

 
     wxScrollEvent event( wxEVT_SCROLL_THUMBRELEASE, m_windowId );
     if ( m_windowStyle & wxHORIZONTAL )
 
     wxScrollEvent event( wxEVT_SCROLL_THUMBRELEASE, m_windowId );
     if ( m_windowStyle & wxHORIZONTAL )


@@ -127,9 +127,9 @@ wxSize wxScrollBar::DoGetBestSize() const
 
 void wxScrollBar::TriggerScrollEvent( wxEventType scrollEvent )
 {
 
 void wxScrollBar::TriggerScrollEvent( wxEventType scrollEvent )
 {

-    int position = m_peer->GetValue();
+    int position = GetPeer()->GetValue();

     int minPos = 0 ;
     int minPos = 0 ;

-    int maxPos = m_peer->GetMaximum();
+    int maxPos = GetPeer()->GetMaximum();

     int nScrollInc = 0;
 
     if ( scrollEvent == wxEVT_SCROLL_LINEUP )
     int nScrollInc = 0;
 
     if ( scrollEvent == wxEVT_SCROLL_LINEUP )