projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introducing wxBase for borland based on Michael Fieldings patch 598106
[wxWidgets.git]
/
src
/
mac
/
scrolbar.cpp
diff --git
a/src/mac/scrolbar.cpp
b/src/mac/scrolbar.cpp
index 51c01e4cefec4ea31db117e7dd7faedcbc50ad80..9073f709950fc0ee6524d7426ee36369a7bdba67 100644
(file)
--- a/
src/mac/scrolbar.cpp
+++ b/
src/mac/scrolbar.cpp
@@
-15,6
+15,11
@@
#include "wx/defs.h"
#include "wx/defs.h"
+#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/scrolbar.h"
#include "wx/mac/uma.h"
@@
-43,12
+48,12
@@
bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
MacPreControlCreate( parent , id , "" , pos , size ,style, validator , name , &bounds , title ) ;
MacPreControlCreate( parent , id , "" , pos , size ,style, validator , name , &bounds , title ) ;
- m_macControl = ::NewControl(
parent->MacGetRootWindow(
) , &bounds , title , true , 0 , 0 , 100,
+ m_macControl = ::NewControl(
MAC_WXHWND(parent->MacGetRootWindow()
) , &bounds , title , true , 0 , 0 , 100,
kControlScrollBarLiveProc , (long) this ) ;
kControlScrollBarLiveProc , (long) this ) ;
- wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
+ wxASSERT_MSG(
(ControlHandle)
m_macControl != NULL , "No valid mac control" ) ;
- ::SetControlAction( m_macControl , wxMacLiveScrollbarActionUPP ) ;
+ ::SetControlAction(
(ControlHandle)
m_macControl , wxMacLiveScrollbarActionUPP ) ;
MacPostControlCreate() ;
MacPostControlCreate() ;
@@
-61,35
+66,36
@@
wxScrollBar::~wxScrollBar()
void wxScrollBar::SetThumbPosition(int viewStart)
{
void wxScrollBar::SetThumbPosition(int viewStart)
{
- ::SetControl
Value(
m_macControl , viewStart ) ;
+ ::SetControl
32BitValue( (ControlHandle)
m_macControl , viewStart ) ;
}
int wxScrollBar::GetThumbPosition() const
{
}
int wxScrollBar::GetThumbPosition() const
{
- return ::GetControl
Value(
m_macControl ) ;
+ return ::GetControl
32BitValue( (ControlHandle)
m_macControl ) ;
}
void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
bool refresh)
{
}
void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
bool refresh)
{
- m_
view
Size = pageSize;
- m_
page
Size = thumbSize;
+ m_
page
Size = pageSize;
+ m_
view
Size = thumbSize;
m_objectSize = range;
m_objectSize = range;
- int range1 = wxMax((m_objectSize - m_
page
Size), 0) ;
+ int range1 = wxMax((m_objectSize - m_
view
Size), 0) ;
- SetControl
Maximum(
m_macControl , range1 ) ;
- SetControl
Minimum(
m_macControl , 0 ) ;
- SetControl
Value(
m_macControl , position ) ;
+ SetControl
32BitMaximum( (ControlHandle)
m_macControl , range1 ) ;
+ SetControl
32BitMinimum( (ControlHandle)
m_macControl , 0 ) ;
+ SetControl
32BitValue( (ControlHandle)
m_macControl , position ) ;
if ( UMAGetAppearanceVersion() >= 0x0110 )
{
if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress )
{
if ( UMAGetAppearanceVersion() >= 0x0110 )
{
if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress )
{
-
SetControlViewSize( m_macControl , m_page
Size ) ;
+
SetControlViewSize( (ControlHandle) m_macControl , m_view
Size ) ;
}
}
}
}
- Refresh() ;
+ if ( refresh )
+ MacRedrawControl() ;
}
}
@@
-99,14
+105,14
@@
void wxScrollBar::Command(wxCommandEvent& event)
ProcessCommand(event);
}
ProcessCommand(event);
}
-void wxScrollBar::MacHandleControlClick(
ControlHandle control , S
Int16 controlpart )
+void wxScrollBar::MacHandleControlClick(
WXWidget control , wx
Int16 controlpart )
{
{
- if ( m_macControl == NULL )
+ if (
(ControlHandle)
m_macControl == NULL )
return ;
return ;
- int position = GetControl
Value(
m_macControl) ;
- int minPos = GetControl
Minimum(
m_macControl) ;
- int maxPos = GetControl
Maximum(
m_macControl) ;
+ int position = GetControl
32BitValue( (ControlHandle)
m_macControl) ;
+ int minPos = GetControl
32BitMinimum( (ControlHandle)
m_macControl) ;
+ int maxPos = GetControl
32BitMaximum( (ControlHandle)
m_macControl) ;
wxEventType scrollEvent = wxEVT_NULL;
int nScrollInc;
wxEventType scrollEvent = wxEVT_NULL;
int nScrollInc;
@@
-114,31
+120,34
@@
void wxScrollBar::MacHandleControlClick( ControlHandle control , SInt16 controlp
switch( controlpart )
{
case kControlUpButtonPart :
switch( controlpart )
{
case kControlUpButtonPart :
- nScrollInc = -
m_pageSize
;
+ nScrollInc = -
1
;
scrollEvent = wxEVT_SCROLL_LINEUP;
break ;
case kControlDownButtonPart :
scrollEvent = wxEVT_SCROLL_LINEUP;
break ;
case kControlDownButtonPart :
- nScrollInc =
m_pageSize
;
+ nScrollInc =
1
;
scrollEvent = wxEVT_SCROLL_LINEDOWN;
break ;
case kControlPageUpPart :
scrollEvent = wxEVT_SCROLL_LINEDOWN;
break ;
case kControlPageUpPart :
- nScrollInc = -m_
view
Size;
+ nScrollInc = -m_
page
Size;
scrollEvent = wxEVT_SCROLL_PAGEUP;
break ;
case kControlPageDownPart :
scrollEvent = wxEVT_SCROLL_PAGEUP;
break ;
case kControlPageDownPart :
- nScrollInc = m_
view
Size;
+ nScrollInc = m_
page
Size;
scrollEvent = wxEVT_SCROLL_PAGEDOWN;
break ;
case kControlIndicatorPart :
nScrollInc = 0 ;
scrollEvent = wxEVT_SCROLL_THUMBTRACK;
break ;
scrollEvent = wxEVT_SCROLL_PAGEDOWN;
break ;
case kControlIndicatorPart :
nScrollInc = 0 ;
scrollEvent = wxEVT_SCROLL_THUMBTRACK;
break ;
+ default :
+ wxLogError(_("illegal scrollbar selector %d"), controlpart);
+ break ;
}
int new_pos = position + nScrollInc;
}
int new_pos = position + nScrollInc;
- if (new_pos <
0
)
- new_pos =
0
;
+ if (new_pos <
minPos
)
+ new_pos =
minPos
;
if (new_pos > maxPos)
new_pos = maxPos;
if ( nScrollInc )
if (new_pos > maxPos)
new_pos = maxPos;
if ( nScrollInc )