Made all bitmaps 16x16

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

diff --git a/src/mac/classic/scrolbar.cpp b/src/mac/classic/scrolbar.cpp
index 70545c7c8d3a20445431a12cc54ee170ede4afe1..b2a54ee3a39ecd4f0c0af025e1fbddf54d995675 100644 (file)
--- a/src/mac/classic/scrolbar.cpp
+++ b/src/mac/classic/scrolbar.cpp
@@ -1,36 +1,34 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        scrolbar.cpp
+// Name:        src/mac/classic/scrolbar.cpp

 // Purpose:     wxScrollBar
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxScrollBar
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "scrolbar.h"
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include "wx/defs.h"
+#include "wx/scrolbar.h"

 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif // WX_PRECOMP
 

-#include "wx/scrolbar.h"

 #include "wx/mac/uma.h"
 
 #include "wx/mac/uma.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 
 BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 
 BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
 END_EVENT_TABLE()
 

-#endif
-

 extern ControlActionUPP wxMacLiveScrollbarActionUPP ;
 
 // Scrollbar
 extern ControlActionUPP wxMacLiveScrollbarActionUPP ;
 
 // Scrollbar


@@ -41,7 +39,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxString& name)
 {
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
            const wxString& name)
 {
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )

-        return FALSE;
+        return false;

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


@@ -49,7 +47,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
     MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, validator , name , &bounds , title ) ;
 
     m_macControl = (WXWidget) ::NewControl(MAC_WXHWND(parent->MacGetRootWindow()) ,
     MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, validator , name , &bounds , title ) ;
 
     m_macControl = (WXWidget) ::NewControl(MAC_WXHWND(parent->MacGetRootWindow()) ,

-                                &bounds , title , false , 0 , 0 , 100, 
+                                &bounds , title , false , 0 , 0 , 100,

                                 kControlScrollBarLiveProc , (long) this) ;
 
     wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;
                                 kControlScrollBarLiveProc , (long) this) ;
 
     wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;


@@ -58,7 +56,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
     MacPostControlCreate() ;
 
 
     MacPostControlCreate() ;
 

-    return TRUE;
+    return true;

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


@@ -102,26 +100,26 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
 
 void wxScrollBar::Command(wxCommandEvent& event)
 {
 
 void wxScrollBar::Command(wxCommandEvent& event)
 {

-    SetThumbPosition(event.m_commandInt);
+    SetThumbPosition(event.GetInt());

     ProcessCommand(event);
 }
 
     ProcessCommand(event);
 }
 

-void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) 
+void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown )

 {
     if ( (ControlHandle) m_macControl == NULL )
         return ;
 {
     if ( (ControlHandle) m_macControl == NULL )
         return ;

-    
+

     int position = GetControl32BitValue( (ControlHandle) m_macControl) ;
     int minPos = GetControl32BitMinimum( (ControlHandle) m_macControl) ;
     int maxPos = GetControl32BitMaximum( (ControlHandle) m_macControl) ;
     int position = GetControl32BitValue( (ControlHandle) m_macControl) ;
     int minPos = GetControl32BitMinimum( (ControlHandle) m_macControl) ;
     int maxPos = GetControl32BitMaximum( (ControlHandle) m_macControl) ;

-    
+

     wxEventType scrollEvent = wxEVT_NULL;
     int nScrollInc = 0;
     wxEventType scrollEvent = wxEVT_NULL;
     int nScrollInc = 0;

-    
+

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

-    
+

     switch( controlpart )
     {
     case kControlUpButtonPart :
     switch( controlpart )
     {
     case kControlUpButtonPart :


@@ -151,16 +149,16 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart
         wxFAIL_MSG(wxT("illegal scrollbar selector"));
         break ;
     }
         wxFAIL_MSG(wxT("illegal scrollbar selector"));
         break ;
     }

-    
+

     int new_pos = position + nScrollInc;
     int new_pos = position + nScrollInc;

-    
+

     if (new_pos < minPos)
         new_pos = minPos;
     if (new_pos > maxPos)
         new_pos = maxPos;
     if ( nScrollInc )
         SetThumbPosition(new_pos);
     if (new_pos < minPos)
         new_pos = minPos;
     if (new_pos > maxPos)
         new_pos = maxPos;
     if ( nScrollInc )
         SetThumbPosition(new_pos);

-    
+

     wxScrollEvent event(scrollEvent, m_windowId);
     if ( m_windowStyle & wxHORIZONTAL )
     {
     wxScrollEvent event(scrollEvent, m_windowId);
     if ( m_windowStyle & wxHORIZONTAL )
     {


@@ -181,4 +179,3 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart
     else
         GetEventHandler()->ProcessEvent(event);
 }
     else
         GetEventHandler()->ProcessEvent(event);
 }

-