projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
only set focus on textctrl item if it exists (exists if combo box is editable)
[wxWidgets.git]
/
src
/
mac
/
carbon
/
scrolbar.cpp
diff --git
a/src/mac/carbon/scrolbar.cpp
b/src/mac/carbon/scrolbar.cpp
index 92d6dd1fafe7b9b1f1c27a2b6774ab810d21420f..49dc3aeca24b319f86c4d566884ee7f4fea840f3 100644
(file)
--- a/
src/mac/carbon/scrolbar.cpp
+++ b/
src/mac/carbon/scrolbar.cpp
@@
-13,6
+13,8
@@
#pragma implementation "scrolbar.h"
#endif
#pragma implementation "scrolbar.h"
#endif
+#include "wx/defs.h"
+
#include "wx/scrolbar.h"
#include "wx/mac/uma.h"
#include "wx/scrolbar.h"
#include "wx/mac/uma.h"
@@
-41,12
+43,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 =
UMANewControl( parent->GetMacRootWindow(
) , &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() ;
@@
-59,34
+61,36
@@
wxScrollBar::~wxScrollBar()
void wxScrollBar::SetThumbPosition(int viewStart)
{
void wxScrollBar::SetThumbPosition(int viewStart)
{
- ::SetControlValue( m_macControl , viewStart ) ;
+ ::SetControlValue(
(ControlHandle)
m_macControl , viewStart ) ;
}
int wxScrollBar::GetThumbPosition() const
{
}
int wxScrollBar::GetThumbPosition() const
{
- return ::GetControlValue( m_macControl ) ;
+ return ::GetControlValue(
(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) ;
- SetControlMaximum( m_macControl , range1 ) ;
- SetControlMinimum( m_macControl , 0 ) ;
- SetControlValue( m_macControl , position ) ;
+ SetControlMaximum(
(ControlHandle)
m_macControl , range1 ) ;
+ SetControlMinimum(
(ControlHandle)
m_macControl , 0 ) ;
+ SetControlValue(
(ControlHandle)
m_macControl , position ) ;
if ( UMAGetAppearanceVersion() >= 0x0110 )
{
if ( UMAGetAppearanceVersion() >= 0x0110 )
{
-#if UMA_USE_8_6
- SetControlViewSize( m_macControl , m_pageSize ) ;
-#endif
+ if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress )
+ {
+ SetControlViewSize( (ControlHandle) m_macControl , m_viewSize ) ;
+ }
}
}
- Refresh() ;
+ if ( refresh )
+ MacRedrawControl() ;
}
}
@@
-96,14
+100,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 = GetControlValue( m_macControl) ;
- int minPos = GetControlMinimum( m_macControl) ;
- int maxPos = GetControlMaximum( m_macControl) ;
+ int position = GetControlValue(
(ControlHandle)
m_macControl) ;
+ int minPos = GetControlMinimum(
(ControlHandle)
m_macControl) ;
+ int maxPos = GetControlMaximum(
(ControlHandle)
m_macControl) ;
wxEventType scrollEvent = wxEVT_NULL;
int nScrollInc;
wxEventType scrollEvent = wxEVT_NULL;
int nScrollInc;