Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

further separating implementation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-07-11 16:19:18 +00:00
parent f18925dfe5
commit 5ca0d8122a
28 changed files with 2604 additions and 1879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
include/wx/mac/carbon/private.h
View File

@@ -336,12 +336,20 @@ public :
virtual ~wxMacControl() virtual ~wxMacControl()
{ {
} }
bool Ok() const { return m_controlRef != NULL ; }
virtual void Dispose() ;
bool Ok() const { return GetControlRef() != NULL ; }
virtual ControlRef * GetControlRefAddr() { return &m_controlRef; }
virtual ControlRef GetControlRef() const { return m_controlRef ; }
virtual void SetReference( SInt32 data ) ;
/*
void operator= (ControlRef c) { m_controlRef = c ; } void operator= (ControlRef c) { m_controlRef = c ; }
operator ControlRef () { return m_controlRef; } operator ControlRef () { return m_controlRef; }
operator ControlRef * () { return &m_controlRef; } operator ControlRef * () { return &m_controlRef; }
*/
// accessing data and values // accessing data and values
virtual OSStatus SetData( ControlPartCode inPartCode , ResType inTag , Size inSize , const void * inData ) ; virtual OSStatus SetData( ControlPartCode inPartCode , ResType inTag , Size inSize , const void * inData ) ;
@@ -363,6 +371,10 @@ public :
virtual void SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum ) ; virtual void SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum ) ;
virtual void SetRange( SInt32 minimum , SInt32 maximum ) ; virtual void SetRange( SInt32 minimum , SInt32 maximum ) ;
virtual OSStatus SetFocus( ControlFocusPart focusPart ) ;
virtual bool HasFocus() const ;
virtual bool NeedsFocusRect() const ;
// templated helpers // templated helpers
Size GetDataSize( ControlPartCode inPartCode , ResType inTag ) const Size GetDataSize( ControlPartCode inPartCode , ResType inTag ) const
@@ -395,7 +407,67 @@ public :
virtual void Flash( ControlPartCode part , UInt32 ticks = 8 ) ; virtual void Flash( ControlPartCode part , UInt32 ticks = 8 ) ;
virtual void VisibilityChanged( bool shown ) ; virtual void VisibilityChanged( bool shown ) ;
virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle ) ; virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle ) ;
virtual ControlPartCode HandleKey( SInt16 keyCode, SInt16 charCode, EventModifiers modifiers ) ;
void SetActionProc( ControlActionUPP actionProc ) ;
void SetViewSize( SInt32 viewSize ) ;
SInt32 GetViewSize() const ;
virtual bool IsVisible() const ;
virtual void SetVisibility( bool visible , bool redraw ) ;
virtual bool IsEnabled() const ;
virtual bool IsActive() const ;
virtual void Enable( bool enable ) ;
// invalidates this control and all children
virtual void InvalidateWithChildren() ;
virtual void SetDrawingEnabled( bool enable ) ;
virtual bool GetNeedsDisplay() const ;
virtual void SetNeedsDisplay( bool needsDisplay , RgnHandle where = NULL ) ;
virtual void ScrollRect( const wxRect &rect , int dx , int dy ) ;
virtual void GetRect( Rect *r ) ;
virtual void SetRect( Rect *r ) ;
virtual void GetRectInWindowCoords( Rect *r ) ;
virtual void GetBestRect( Rect *r ) ;
virtual void SetTitle( const wxString &title ) ;
// converts from Toplevel-Content relative to local
static void Convert( wxPoint *pt , wxMacControl *convert , wxMacControl *to ) ;
virtual void GetFeatures( UInt32 *features ) ;
virtual OSStatus GetRegion( ControlPartCode partCode , RgnHandle region ) ;
virtual OSStatus SetZOrder( bool above , wxMacControl* other ) ;
// to be moved into a databrowser subclass
virtual OSStatus SetSelectionFlags( DataBrowserSelectionFlags ) ;
virtual OSStatus AddListViewColumn( DataBrowserListViewColumnDesc *columnDesc,
DataBrowserTableViewColumnIndex position ) ;
virtual OSStatus AutoSizeListViewColumns() ;
virtual OSStatus SetHasScrollBars( bool horiz , bool vert ) ;
virtual OSStatus SetTableViewHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle ) ;
virtual OSStatus SetListViewHeaderBtnHeight(UInt16 height) ;
virtual OSStatus SetCallbacks(const DataBrowserCallbacks * callbacks) ;
virtual OSStatus UpdateItems( DataBrowserItemID container, UInt32 numItems,
const DataBrowserItemID* items,
DataBrowserPropertyID preSortProperty,
DataBrowserPropertyID propertyID ) ;
virtual OSStatus AddItems( DataBrowserItemID container, UInt32 numItems,
const DataBrowserItemID* items,
DataBrowserPropertyID preSortProperty ) ;
virtual OSStatus RemoveItems( DataBrowserItemID container, UInt32 numItems,
const DataBrowserItemID* items,
DataBrowserPropertyID preSortProperty ) ;
virtual OSStatus RevealItem( DataBrowserItemID item,
DataBrowserPropertyID propertyID,
DataBrowserRevealOptions options ) ;
virtual bool IsItemSelected( DataBrowserItemID item ) ;
virtual OSStatus SetSelectedItems(UInt32 numItems,
const DataBrowserItemID * items,
DataBrowserSetOption operation ) ;
// to be moved into a tab control class
virtual OSStatus SetTabEnabled( SInt16 tabNo , bool enable ) ;
protected : protected :
ControlRef m_controlRef ; ControlRef m_controlRef ;
wxFont m_font ; wxFont m_font ;

9
include/wx/mac/carbon/textctrl.h
View File

@@ -20,6 +20,8 @@
WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
class wxMacTextControl ;
// Single-line text item // Single-line text item
class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase
{ {
@@ -169,6 +171,7 @@ public:
virtual wxInt16 MacControlUserPaneFocusProc(wxInt16 action) ; virtual wxInt16 MacControlUserPaneFocusProc(wxInt16 action) ;
virtual void MacControlUserPaneBackgroundProc(void* info) ; virtual void MacControlUserPaneBackgroundProc(void* info) ;
wxMacTextControl* GetPeer() const { return (wxMacTextControl*) m_peer ; }
protected: protected:
// common part of all ctors // common part of all ctors
void Init(); void Init();
@@ -180,14 +183,8 @@ protected:
// flag is set to true when the user edits the controls contents // flag is set to true when the user edits the controls contents
bool m_dirty; bool m_dirty;
WXWidget m_scrollView ;
WXWidget m_textView ;
void* m_macTXN ;
unsigned long m_maxLength ; unsigned long m_maxLength ;
// need to make this public because of the current implementation via callbacks // need to make this public because of the current implementation via callbacks
public :
void* m_macTXNvars ;
private : private :
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

2
include/wx/mac/carbon/window.h
View File

@@ -205,7 +205,7 @@ public:
{ return (m_hScrollBar == sb || m_vScrollBar == sb) ; } { return (m_hScrollBar == sb || m_vScrollBar == sb) ; }
wxList& GetSubcontrols() { return m_subControls; } wxList& GetSubcontrols() { return m_subControls; }
virtual void MacInstallEventHandler() ; virtual void MacInstallEventHandler(WXWidget native) ;
virtual void MacRedrawControl(); virtual void MacRedrawControl();
WXEVENTHANDLERREF MacGetControlEventHandler() { return m_macControlEventHandler ; } WXEVENTHANDLERREF MacGetControlEventHandler() { return m_macControlEventHandler ; }
void MacPostControlCreate(const wxPoint& pos, const wxSize& size) ; void MacPostControlCreate(const wxPoint& pos, const wxSize& size) ;

2
src/mac/carbon/bmpbuttn.cpp
View File

@@ -76,7 +76,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
m_peer = new wxMacControl() ; m_peer = new wxMacControl() ;
verify_noerr ( CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , verify_noerr ( CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") ,
(( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevel : kControlBevelButtonNormalBevel ) , (( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevel : kControlBevelButtonNormalBevel ) ,
kControlBehaviorOffsetContents , &info , 0 , 0 , 0 , *m_peer ) ); kControlBehaviorOffsetContents , &info , 0 , 0 , 0 , m_peer->GetControlRefAddr() ) );
wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ; wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;

9
src/mac/carbon/button.cpp
View File

@@ -42,14 +42,14 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
m_peer = new wxMacControl() ; m_peer = new wxMacControl() ;
if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND) if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND)
{ {
verify_noerr ( CreatePushButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , *m_peer ) ); verify_noerr ( CreatePushButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , m_peer->GetControlRefAddr() ) );
} }
else else
{ {
ControlButtonContentInfo info ; ControlButtonContentInfo info ;
info.contentType = kControlNoContent ; info.contentType = kControlNoContent ;
verify_noerr(CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds,CFSTR(""), verify_noerr(CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds,CFSTR(""),
kControlBevelButtonLargeBevel , kControlBehaviorPushbutton , &info , 0 , 0 , 0 , *m_peer ) ); kControlBevelButtonLargeBevel , kControlBehaviorPushbutton , &info , 0 , 0 , 0 , m_peer->GetControlRefAddr() ) );
} }
wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ; wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;
@@ -97,8 +97,7 @@ wxSize wxButton::DoGetBestSize() const
} }
Rect bestsize = { 0 , 0 , 0 , 0 } ; Rect bestsize = { 0 , 0 , 0 , 0 } ;
short baselineoffset ; m_peer->GetBestRect( &bestsize ) ;
::GetBestControlRect( *m_peer , &bestsize , &baselineoffset ) ;
int wBtn = 0 ; int wBtn = 0 ;
if ( EmptyRect( &bestsize ) ) if ( EmptyRect( &bestsize ) )
@@ -107,7 +106,7 @@ wxSize wxButton::DoGetBestSize() const
} }
else else
{ {
sz.x = bestsize.right - bestsize.left ; wBtn = bestsize.right - bestsize.left ;
sz.y = bestsize.bottom - bestsize.top ; sz.y = bestsize.bottom - bestsize.top ;
} }

2
src/mac/carbon/checkbox.cpp
View File

@@ -45,7 +45,7 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
m_peer = new wxMacControl() ; m_peer = new wxMacControl() ;
verify_noerr( CreateCheckBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds , verify_noerr( CreateCheckBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds ,
CFSTR("") , 0 , false , *m_peer ) ); CFSTR("") , 0 , false , m_peer->GetControlRefAddr() ) );
m_peer->SetMaximum( maxValue ) ; m_peer->SetMaximum( maxValue ) ;

21
src/mac/carbon/checklst.cpp
View File

@@ -233,7 +233,7 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
m_peer = new wxMacControl() ; m_peer = new wxMacControl() ;
verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , *m_peer ) ); verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , m_peer->GetControlRefAddr() ) );
DataBrowserSelectionFlags options = kDataBrowserDragSelect ; DataBrowserSelectionFlags options = kDataBrowserDragSelect ;
@@ -249,7 +249,7 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
{ {
options += kDataBrowserSelectOnlyOne ; options += kDataBrowserSelectOnlyOne ;
} }
verify_noerr(SetDataBrowserSelectionFlags (*m_peer, options ) ); verify_noerr(m_peer->SetSelectionFlags( options ) );
DataBrowserListViewColumnDesc columnDesc ; DataBrowserListViewColumnDesc columnDesc ;
columnDesc.headerBtnDesc.titleOffset = 0; columnDesc.headerBtnDesc.titleOffset = 0;
@@ -273,7 +273,7 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
columnDesc.propertyDesc.propertyType = kDataBrowserCheckboxType; columnDesc.propertyDesc.propertyType = kDataBrowserCheckboxType;
columnDesc.propertyDesc.propertyFlags = kDataBrowserPropertyIsMutable | kDataBrowserTableViewSelectionColumn | columnDesc.propertyDesc.propertyFlags = kDataBrowserPropertyIsMutable | kDataBrowserTableViewSelectionColumn |
kDataBrowserDefaultPropertyFlags; kDataBrowserDefaultPropertyFlags;
verify_noerr(::AddDataBrowserListViewColumn(*m_peer, &columnDesc, kDataBrowserListViewAppendColumn) ) ; verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ;
// text column // text column
@@ -289,12 +289,12 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
; ;
verify_noerr(::AddDataBrowserListViewColumn(*m_peer, &columnDesc, kDataBrowserListViewAppendColumn) ) ; verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ;
verify_noerr(::AutoSizeDataBrowserListViewColumns( *m_peer ) ) ; verify_noerr( m_peer->AutoSizeListViewColumns() ) ;
verify_noerr(::SetDataBrowserHasScrollBars( *m_peer , false , true ) ) ; verify_noerr( m_peer->SetHasScrollBars( false , true ) ) ;
verify_noerr(::SetDataBrowserTableViewHiliteStyle( *m_peer, kDataBrowserTableViewFillHilite ) ) ; verify_noerr( m_peer->SetTableViewHiliteStyle( kDataBrowserTableViewFillHilite ) ) ;
verify_noerr(::SetDataBrowserListViewHeaderBtnHeight( *m_peer , 0 ) ) ; verify_noerr( m_peer->SetListViewHeaderBtnHeight(0 ) ) ;
DataBrowserCallbacks callbacks ; DataBrowserCallbacks callbacks ;
callbacks.version = kDataBrowserLatestCallbacks; callbacks.version = kDataBrowserLatestCallbacks;
@@ -306,7 +306,7 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
#else #else
NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ; NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
#endif #endif
SetDataBrowserCallbacks(*m_peer, &callbacks); m_peer->SetCallbacks( &callbacks);
MacPostControlCreate(pos,size) ; MacPostControlCreate(pos,size) ;
@@ -337,13 +337,12 @@ void wxCheckListBox::Check(size_t item, bool check)
wxCHECK_RET( item < m_checks.GetCount(), wxCHECK_RET( item < m_checks.GetCount(),
_T("invalid index in wxCheckListBox::Check") ); _T("invalid index in wxCheckListBox::Check") );
// intermediate var is needed to avoid compiler warning with VC++
bool isChecked = m_checks[item] != 0; bool isChecked = m_checks[item] != 0;
if ( check != isChecked ) if ( check != isChecked )
{ {
m_checks[item] = check; m_checks[item] = check;
UInt32 id = m_idArray[item] ; UInt32 id = m_idArray[item] ;
verify_noerr( ::UpdateDataBrowserItems( *m_peer , kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ; verify_noerr( m_peer->UpdateItems(kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;
} }
} }

2
src/mac/carbon/choice.cpp
View File

@@ -69,7 +69,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
m_peer = new wxMacControl() ; m_peer = new wxMacControl() ;
verify_noerr ( CreatePopupButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , verify_noerr ( CreatePopupButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") ,
-12345 , false /* no variable width */ , 0 , 0 , 0 , *m_peer ) ); -12345 , false /* no variable width */ , 0 , 0 , 0 , m_peer->GetControlRefAddr() ) );
m_macPopUpMenuHandle = NewUniqueMenu() ; m_macPopUpMenuHandle = NewUniqueMenu() ;

14
src/mac/carbon/control.cpp
View File

@@ -88,8 +88,6 @@ void wxControl::OnKeyDown( wxKeyEvent &event )
if ( m_peer == NULL || !m_peer->Ok() ) if ( m_peer == NULL || !m_peer->Ok() )
return ; return ;
#if TARGET_CARBON
char charCode ; char charCode ;
UInt32 keyCode ; UInt32 keyCode ;
UInt32 modifiers ; UInt32 modifiers ;
@@ -98,16 +96,6 @@ void wxControl::OnKeyDown( wxKeyEvent &event )
GetEventParameter( (EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode ); GetEventParameter( (EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode );
GetEventParameter((EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers); GetEventParameter((EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers);
::HandleControlKey( *m_peer , keyCode , charCode , modifiers ) ; m_peer->HandleKey( keyCode , charCode , modifiers ) ;
#else
EventRecord *ev = (EventRecord*) wxTheApp->MacGetCurrentEvent() ;
short keycode ;
short keychar ;
keychar = short(ev->message & charCodeMask);
keycode = short(ev->message & keyCodeMask) >> 8 ;
::HandleControlKey( *m_peer , keycode , keychar , ev->modifiers ) ;
#endif
} }

2
src/mac/carbon/gauge.cpp
View File

@@ -44,7 +44,7 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
m_peer = new wxMacControl() ; m_peer = new wxMacControl() ;
verify_noerr ( CreateProgressBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , verify_noerr ( CreateProgressBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
GetValue() , 0 , GetRange() , false /* not indeterminate */ , *m_peer ) ); GetValue() , 0 , GetRange() , false /* not indeterminate */ , m_peer->GetControlRefAddr() ) );
MacPostControlCreate(pos,size) ; MacPostControlCreate(pos,size) ;

4
src/mac/carbon/glcanvas.cpp
View File

@@ -331,7 +331,7 @@ bool wxGLCanvas::Show(bool show)
} }
else else
{ {
if ( IsControlVisible( *m_peer ) && !m_macCanvasIsShown ) if ( m_peer->IsVisible()&& !m_macCanvasIsShown )
{ {
m_macCanvasIsShown = true ; m_macCanvasIsShown = true ;
SetViewport() ; SetViewport() ;
@@ -343,7 +343,7 @@ bool wxGLCanvas::Show(bool show)
void wxGLCanvas::MacVisibilityChanged() void wxGLCanvas::MacVisibilityChanged()
{ {
if ( !IsControlVisible( *m_peer ) ) if ( !MacIsReallyShown() )
{ {
if ( m_macCanvasIsShown ) if ( m_macCanvasIsShown )
{ {

1
src/mac/carbon/gsocket.c
View File

@@ -163,7 +163,6 @@ pascal void OTInetEventHandler(void*s, OTEventCode event, OTResult result, void
if ( event == kOTSyncIdleEvent ) if ( event == kOTSyncIdleEvent )
{ {
YieldToAnyThread() ;
return ; return ;
} }

42
src/mac/carbon/listbox.cpp
View File

@@ -177,7 +177,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
m_peer = new wxMacControl() ; m_peer = new wxMacControl() ;
verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , *m_peer ) ); verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , m_peer->GetControlRefAddr() ) );
DataBrowserSelectionFlags options = kDataBrowserDragSelect ; DataBrowserSelectionFlags options = kDataBrowserDragSelect ;
if ( style & wxLB_MULTIPLE ) if ( style & wxLB_MULTIPLE )
@@ -192,7 +192,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
{ {
options += kDataBrowserSelectOnlyOne ; options += kDataBrowserSelectOnlyOne ;
} }
verify_noerr(SetDataBrowserSelectionFlags (*m_peer, options ) ); verify_noerr(m_peer->SetSelectionFlags( options ) );
DataBrowserListViewColumnDesc columnDesc ; DataBrowserListViewColumnDesc columnDesc ;
columnDesc.headerBtnDesc.titleOffset = 0; columnDesc.headerBtnDesc.titleOffset = 0;
@@ -220,11 +220,11 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
kDataBrowserTableViewSelectionColumn ; kDataBrowserTableViewSelectionColumn ;
verify_noerr(::AddDataBrowserListViewColumn(*m_peer, &columnDesc, kDataBrowserListViewAppendColumn) ) ; verify_noerr(m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ;
verify_noerr(::AutoSizeDataBrowserListViewColumns( *m_peer ) ) ; verify_noerr(m_peer->AutoSizeListViewColumns() ) ;
verify_noerr(::SetDataBrowserHasScrollBars( *m_peer , false , true ) ) ; verify_noerr(m_peer->SetHasScrollBars(false , true ) ) ;
verify_noerr(::SetDataBrowserTableViewHiliteStyle( *m_peer, kDataBrowserTableViewFillHilite ) ) ; verify_noerr(m_peer->SetTableViewHiliteStyle(kDataBrowserTableViewFillHilite ) ) ;
verify_noerr(::SetDataBrowserListViewHeaderBtnHeight( *m_peer , 0 ) ) ; verify_noerr(m_peer->SetListViewHeaderBtnHeight( 0 ) ) ;
DataBrowserCallbacks callbacks ; DataBrowserCallbacks callbacks ;
callbacks.version = kDataBrowserLatestCallbacks; callbacks.version = kDataBrowserLatestCallbacks;
@@ -240,7 +240,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
#else #else
NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ; NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
#endif #endif
SetDataBrowserCallbacks(*m_peer, &callbacks); m_peer->SetCallbacks( &callbacks);
MacPostControlCreate(pos,size) ; MacPostControlCreate(pos,size) ;
@@ -256,7 +256,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
wxListBox::~wxListBox() wxListBox::~wxListBox()
{ {
SetControlReference( *m_peer , NULL ) ; m_peer->SetReference( NULL ) ;
FreeData() ; FreeData() ;
// avoid access during destruction // avoid access during destruction
if ( m_macList ) if ( m_macList )
@@ -629,27 +629,27 @@ wxOwnerDrawn *wxListBox::CreateItem(size_t n)
void wxListBox::MacDelete( int N ) void wxListBox::MacDelete( int N )
{ {
UInt32 id = m_idArray[N] ; UInt32 id = m_idArray[N] ;
verify_noerr(::RemoveDataBrowserItems(*m_peer , kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ; verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;
m_idArray.RemoveAt( N ) ; m_idArray.RemoveAt( N ) ;
} }
void wxListBox::MacInsert( int n , const wxString& text) void wxListBox::MacInsert( int n , const wxString& text)
{ {
verify_noerr(::AddDataBrowserItems( *m_peer , kDataBrowserNoItem , 1 , (UInt32*) &m_nextId , kDataBrowserItemNoProperty ) ) ; verify_noerr( m_peer->AddItems( kDataBrowserNoItem , 1 , (UInt32*) &m_nextId , kDataBrowserItemNoProperty ) ) ;
m_idArray.Insert( m_nextId , n ) ; m_idArray.Insert( m_nextId , n ) ;
++m_nextId ; ++m_nextId ;
} }
void wxListBox::MacAppend( const wxString& text) void wxListBox::MacAppend( const wxString& text)
{ {
verify_noerr(::AddDataBrowserItems( *m_peer , kDataBrowserNoItem , 1 , (UInt32*) &m_nextId , kDataBrowserItemNoProperty ) ) ; verify_noerr( m_peer->AddItems( kDataBrowserNoItem , 1 , (UInt32*) &m_nextId , kDataBrowserItemNoProperty ) ) ;
m_idArray.Add( m_nextId ) ; m_idArray.Add( m_nextId ) ;
++m_nextId ; ++m_nextId ;
} }
void wxListBox::MacClear() void wxListBox::MacClear()
{ {
verify_noerr(::RemoveDataBrowserItems(*m_peer , kDataBrowserNoItem , 0 , NULL , kDataBrowserItemNoProperty ) ) ; verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 0 , NULL , kDataBrowserItemNoProperty ) ) ;
m_idArray.Empty() ; m_idArray.Empty() ;
} }
@@ -662,26 +662,26 @@ void wxListBox::MacSetSelection( int n , bool select )
if ( n >= 0 ) if ( n >= 0 )
{ {
UInt32 idOld = m_idArray[n] ; UInt32 idOld = m_idArray[n] ;
SetDataBrowserSelectedItems(*m_peer , 1 , & idOld , kDataBrowserItemsRemove ) ; m_peer->SetSelectedItems( 1 , & idOld , kDataBrowserItemsRemove ) ;
} }
} }
if ( ::IsDataBrowserItemSelected( *m_peer , id ) != select ) if ( m_peer->IsItemSelected( id ) != select )
{ {
verify_noerr(::SetDataBrowserSelectedItems(*m_peer , 1 , & id , kDataBrowserItemsToggle ) ) ; verify_noerr(m_peer->SetSelectedItems( 1 , & id , kDataBrowserItemsToggle ) ) ;
} }
MacScrollTo( n ) ; MacScrollTo( n ) ;
} }
bool wxListBox::MacIsSelected( int n ) const bool wxListBox::MacIsSelected( int n ) const
{ {
return ::IsDataBrowserItemSelected( *m_peer , m_idArray[n] ) ; return m_peer->IsItemSelected( m_idArray[n] ) ;
} }
int wxListBox::MacGetSelection() const int wxListBox::MacGetSelection() const
{ {
for ( size_t i = 0 ; i < m_idArray.GetCount() ; ++i ) for ( size_t i = 0 ; i < m_idArray.GetCount() ; ++i )
{ {
if ( ::IsDataBrowserItemSelected(*m_peer , m_idArray[i] ) ) if ( m_peer->IsItemSelected( m_idArray[i] ) )
{ {
return i ; return i ;
} }
@@ -696,7 +696,7 @@ int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
aSelections.Empty(); aSelections.Empty();
for ( size_t i = 0 ; i < m_idArray.GetCount() ; ++i ) for ( size_t i = 0 ; i < m_idArray.GetCount() ; ++i )
{ {
if ( ::IsDataBrowserItemSelected(*m_peer , m_idArray[i] ) ) if ( m_peer->IsItemSelected( m_idArray[i] ) )
{ {
aSelections.Add( i ) ; aSelections.Add( i ) ;
no_sel++ ; no_sel++ ;
@@ -709,13 +709,13 @@ void wxListBox::MacSet( int n , const wxString& text )
{ {
// as we don't store the strings we only have to issue a redraw // as we don't store the strings we only have to issue a redraw
UInt32 id = m_idArray[n] ; UInt32 id = m_idArray[n] ;
verify_noerr( ::UpdateDataBrowserItems( *m_peer , kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ; verify_noerr( m_peer->UpdateItems( kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;
} }
void wxListBox::MacScrollTo( int n ) void wxListBox::MacScrollTo( int n )
{ {
UInt32 id = m_idArray[n] ; UInt32 id = m_idArray[n] ;
verify_noerr( ::RevealDataBrowserItem(*m_peer , id , kTextColumnId , kDataBrowserRevealWithoutSelecting ) ) ; verify_noerr( m_peer->RevealItem( id , kTextColumnId , kDataBrowserRevealWithoutSelecting ) ) ;
} }
#if !TARGET_API_MAC_OSX #if !TARGET_API_MAC_OSX

23
src/mac/carbon/notebmac.cpp
View File

@@ -127,7 +127,7 @@ bool wxNotebook::Create(wxWindow *parent,
m_peer = new wxMacControl() ; m_peer = new wxMacControl() ;
verify_noerr ( CreateTabsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , verify_noerr ( CreateTabsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
tabsize , tabstyle, 0, NULL, *m_peer ) ); tabsize , tabstyle, 0, NULL, m_peer->GetControlRefAddr() ) );
MacPostControlCreate(pos,size) ; MacPostControlCreate(pos,size) ;
@@ -333,7 +333,7 @@ bool wxNotebook::InsertPage(size_t nPage,
{ {
m_nSelection++; m_nSelection++;
// while this still is the same page showing, we need to update the tabs // while this still is the same page showing, we need to update the tabs
SetControl32BitValue( *m_peer , m_nSelection + 1 ) ; m_peer->SetValue( m_nSelection + 1 ) ;
} }
// some page should be selected: either this one or the first one if there // some page should be selected: either this one or the first one if there
@@ -358,7 +358,7 @@ bool wxNotebook::InsertPage(size_t nPage,
*/ */
void wxNotebook::MacSetupTabs() void wxNotebook::MacSetupTabs()
{ {
SetControl32BitMaximum( *m_peer , GetPageCount() ) ; m_peer->SetMaximum( GetPageCount() ) ;
wxNotebookPage *page; wxNotebookPage *page;
ControlTabInfoRec info; ControlTabInfoRec info;
@@ -370,10 +370,8 @@ void wxNotebook::MacSetupTabs()
info.version = 0; info.version = 0;
info.iconSuiteID = 0; info.iconSuiteID = 0;
wxMacStringToPascal( page->GetLabel() , info.name ) ; wxMacStringToPascal( page->GetLabel() , info.name ) ;
m_peer->SetData<ControlTabInfoRec>( ii+1, kControlTabInfoTag, &info ) ;
SetControlData( *m_peer, ii+1, kControlTabInfoTag, m_peer->SetTabEnabled( ii + 1 , true ) ;
sizeof( ControlTabInfoRec) , (char*) &info ) ;
SetTabEnabled( *m_peer , ii+1 , true ) ;
#if TARGET_CARBON #if TARGET_CARBON
if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 ) if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 )
{ {
@@ -402,8 +400,7 @@ void wxNotebook::MacSetupTabs()
wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ; wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
info.contentType = kControlContentIconRef ; info.contentType = kControlContentIconRef ;
info.u.iconRef = iconRef ; info.u.iconRef = iconRef ;
SetControlData( *m_peer, ii+1,kControlTabImageContentTag, m_peer->SetData<ControlButtonContentInfo>( ii+1,kControlTabImageContentTag, &info );
sizeof( info ), (Ptr)&info );
wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ; wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ;
if ( UMAGetSystemVersion() < 0x1030 ) if ( UMAGetSystemVersion() < 0x1030 )
{ {
@@ -417,7 +414,7 @@ void wxNotebook::MacSetupTabs()
#endif #endif
} }
Rect bounds; Rect bounds;
UMAGetControlBoundsInWindowCoords(*m_peer, &bounds); m_peer->GetRectInWindowCoords( &bounds ) ;
InvalWindowRect((WindowRef)MacGetTopLevelWindowRef(), &bounds); InvalWindowRect((WindowRef)MacGetTopLevelWindowRef(), &bounds);
} }
@@ -569,14 +566,14 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
} }
m_nSelection = nSel; m_nSelection = nSel;
SetControl32BitValue( *m_peer , m_nSelection + 1 ) ; m_peer->SetValue( m_nSelection + 1 ) ;
} }
wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
{ {
OSStatus status = eventNotHandledErr ; OSStatus status = eventNotHandledErr ;
SInt32 newSel = GetControl32BitValue( *m_peer ) - 1 ; SInt32 newSel = m_peer->GetValue() - 1 ;
if ( newSel != m_nSelection ) if ( newSel != m_nSelection )
{ {
wxNotebookEvent changing(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId, wxNotebookEvent changing(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId,
@@ -594,7 +591,7 @@ wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTR
} }
else else
{ {
SetControl32BitValue( *m_peer , m_nSelection + 1 ) ; m_peer->SetValue( m_nSelection + 1 ) ;
} }
status = noErr ; status = noErr ;
} }

2
src/mac/carbon/radiobox.cpp
View File

@@ -140,7 +140,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
m_peer = new wxMacControl() ; m_peer = new wxMacControl() ;
verify_noerr(CreateGroupBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, CFSTR("") , verify_noerr(CreateGroupBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, CFSTR("") ,
true /*primary*/ , *m_peer ) ) ; true /*primary*/ , m_peer->GetControlRefAddr() ) ) ;
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
{ {

8
src/mac/carbon/radiobut.cpp
View File

@@ -41,7 +41,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
m_peer = new wxMacControl() ; m_peer = new wxMacControl() ;
verify_noerr ( CreateRadioButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , verify_noerr ( CreateRadioButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") ,
0 , false /* no autotoggle */ , *m_peer ) ); 0 , false /* no autotoggle */ , m_peer->GetControlRefAddr() ) );
MacPostControlCreate(pos,size) ; MacPostControlCreate(pos,size) ;
@@ -75,10 +75,10 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
void wxRadioButton::SetValue(bool val) void wxRadioButton::SetValue(bool val)
{ {
wxRadioButton *cycle; wxRadioButton *cycle;
if ( GetControl32BitValue( *m_peer ) == val ) if ( m_peer->GetValue() == val )
return ; return ;
::SetControl32BitValue( *m_peer , val ) ; m_peer->SetValue( val ) ;
if (val) if (val)
{ {
cycle=this->NextInCycle(); cycle=this->NextInCycle();
@@ -94,7 +94,7 @@ void wxRadioButton::SetValue(bool val)
bool wxRadioButton::GetValue() const bool wxRadioButton::GetValue() const
{ {
return ::GetControl32BitValue( *m_peer ) ; return m_peer->GetValue() ;
} }
void wxRadioButton::Command (wxCommandEvent & event) void wxRadioButton::Command (wxCommandEvent & event)

26
src/mac/carbon/scrolbar.cpp
View File

@@ -49,7 +49,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
m_peer = new wxMacControl() ; m_peer = new wxMacControl() ;
verify_noerr ( CreateScrollBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , verify_noerr ( CreateScrollBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
0 , 0 , 100 , 1 , true /* liveTracking */ , wxMacLiveScrollbarActionUPP , *m_peer ) ); 0 , 0 , 100 , 1 , true /* liveTracking */ , wxMacLiveScrollbarActionUPP , m_peer->GetControlRefAddr() ) );
MacPostControlCreate(pos,size) ; MacPostControlCreate(pos,size) ;
@@ -63,12 +63,12 @@ wxScrollBar::~wxScrollBar()
void wxScrollBar::SetThumbPosition(int viewStart) void wxScrollBar::SetThumbPosition(int viewStart)
{ {
::SetControl32BitValue( *m_peer , viewStart ) ; m_peer->SetValue( viewStart ) ;
} }
int wxScrollBar::GetThumbPosition() const int wxScrollBar::GetThumbPosition() const
{ {
return ::GetControl32BitValue( *m_peer ) ; return m_peer->GetValue() ;
} }
void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize, void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
@@ -80,10 +80,10 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
int range1 = wxMax((m_objectSize - m_viewSize), 0) ; int range1 = wxMax((m_objectSize - m_viewSize), 0) ;
SetControl32BitMaximum( *m_peer , range1 ) ; m_peer->SetMaximum( range1 ) ;
SetControl32BitMinimum( *m_peer , 0 ) ; m_peer->SetMinimum( 0 ) ;
SetControl32BitValue( *m_peer , position ) ; m_peer->SetValue( position ) ;
SetControlViewSize( *m_peer , m_viewSize ) ; m_peer->SetViewSize( m_viewSize ) ;
if ( refresh ) if ( refresh )
MacRedrawControl() ; MacRedrawControl() ;
@@ -98,9 +98,9 @@ void wxScrollBar::Command(wxCommandEvent& event)
void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown )
{ {
int position = GetControl32BitValue( *m_peer) ; int position = m_peer->GetValue() ;
int minPos = GetControl32BitMinimum( *m_peer) ; int minPos = m_peer->GetMinimum() ;
int maxPos = GetControl32BitMaximum( *m_peer) ; int maxPos = m_peer->GetMaximum() ;
wxEventType scrollEvent = wxEVT_NULL; wxEventType scrollEvent = wxEVT_NULL;
int nScrollInc = 0; int nScrollInc = 0;
@@ -171,9 +171,9 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart
wxInt32 wxScrollBar::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent ) wxInt32 wxScrollBar::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent )
{ {
int position = GetControl32BitValue( *m_peer) ; int position = m_peer->GetValue() ;
int minPos = GetControl32BitMinimum( *m_peer) ; int minPos = m_peer->GetMinimum() ;
int maxPos = GetControl32BitMaximum( *m_peer) ; int maxPos = m_peer->GetMaximum() ;
wxEventType scrollEvent = wxEVT_NULL; wxEventType scrollEvent = wxEVT_NULL;
int nScrollInc = 0; int nScrollInc = 0;

14
src/mac/carbon/slider.cpp
View File

@@ -87,7 +87,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
m_peer = new wxMacControl() ; m_peer = new wxMacControl() ;
verify_noerr ( CreateSliderControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , verify_noerr ( CreateSliderControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
value , minValue , maxValue , kControlSliderPointsDownOrRight , tickMarks , true /* liveTracking */ , value , minValue , maxValue , kControlSliderPointsDownOrRight , tickMarks , true /* liveTracking */ ,
wxMacLiveScrollbarActionUPP , *m_peer ) ); wxMacLiveScrollbarActionUPP , m_peer->GetControlRefAddr() ) );
if(style & wxSL_VERTICAL) { if(style & wxSL_VERTICAL) {
@@ -123,7 +123,7 @@ wxSlider::~wxSlider()
int wxSlider::GetValue() const int wxSlider::GetValue() const
{ {
return GetControl32BitValue( *m_peer) ; return m_peer->GetValue() ;
} }
void wxSlider::SetValue(int value) void wxSlider::SetValue(int value)
@@ -132,7 +132,7 @@ void wxSlider::SetValue(int value)
valuestring.Printf( wxT("%d") , value ) ; valuestring.Printf( wxT("%d") , value ) ;
if ( m_macValueStatic ) if ( m_macValueStatic )
m_macValueStatic->SetLabel( valuestring ) ; m_macValueStatic->SetLabel( valuestring ) ;
SetControl32BitValue( *m_peer , value ) ; m_peer->SetValue( value ) ;
} }
void wxSlider::SetRange(int minValue, int maxValue) void wxSlider::SetRange(int minValue, int maxValue)
@@ -142,8 +142,8 @@ void wxSlider::SetRange(int minValue, int maxValue)
m_rangeMin = minValue; m_rangeMin = minValue;
m_rangeMax = maxValue; m_rangeMax = maxValue;
SetControl32BitMinimum( *m_peer, m_rangeMin); m_peer->SetMinimum( m_rangeMin);
SetControl32BitMaximum( *m_peer, m_rangeMax); m_peer->SetMaximum( m_rangeMax);
if(m_macMinimumStatic) { if(m_macMinimumStatic) {
value.Printf(wxT("%d"), m_rangeMin); value.Printf(wxT("%d"), m_rangeMin);
@@ -237,7 +237,7 @@ void wxSlider::Command (wxCommandEvent & event)
void wxSlider::MacHandleControlClick( WXWidget control , wxInt16 controlpart, bool mouseStillDown ) void wxSlider::MacHandleControlClick( WXWidget control , wxInt16 controlpart, bool mouseStillDown )
{ {
SInt16 value = ::GetControl32BitValue( *m_peer ) ; SInt16 value = m_peer->GetValue() ;
SetValue( value ) ; SetValue( value ) ;
@@ -259,7 +259,7 @@ void wxSlider::MacHandleControlClick( WXWidget control , wxInt16 controlpart, bo
wxInt32 wxSlider::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent ) wxInt32 wxSlider::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent )
{ {
SInt16 value = ::GetControl32BitValue( *m_peer ) ; SInt16 value = m_peer->GetValue() ;
SetValue( value ) ; SetValue( value ) ;

10
src/mac/carbon/spinbutt.cpp
View File

@@ -56,9 +56,9 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
m_peer = new wxMacControl() ; m_peer = new wxMacControl() ;
verify_noerr ( CreateLittleArrowsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 0 , m_min , m_max , 1 , verify_noerr ( CreateLittleArrowsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 0 , m_min , m_max , 1 ,
*m_peer ) ); m_peer->GetControlRefAddr() ) );
SetControlAction( *m_peer , wxMacLiveScrollbarActionUPP ) ; m_peer->SetActionProc( wxMacLiveScrollbarActionUPP ) ;
MacPostControlCreate(pos,size) ; MacPostControlCreate(pos,size) ;
return TRUE; return TRUE;
@@ -95,8 +95,8 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
{ {
m_min = minVal; m_min = minVal;
m_max = maxVal; m_max = maxVal;
SetControl32BitMaximum( *m_peer , maxVal ) ; m_peer->SetMaximum( maxVal ) ;
SetControl32BitMinimum(*m_peer , minVal ) ; m_peer->SetMinimum( minVal ) ;
} }
void wxSpinButton::MacHandleValueChanged( int inc ) void wxSpinButton::MacHandleValueChanged( int inc )
@@ -139,7 +139,7 @@ void wxSpinButton::MacHandleValueChanged( int inc )
{ {
m_value = oldValue ; m_value = oldValue ;
} }
SetControl32BitValue( *m_peer , m_value ) ; m_peer->SetValue( m_value ) ;
/* always send a thumbtrack event */ /* always send a thumbtrack event */
if (scrollEvent != wxEVT_SCROLL_THUMBTRACK) if (scrollEvent != wxEVT_SCROLL_THUMBTRACK)

2
src/mac/carbon/statbox.cpp
View File

@@ -45,7 +45,7 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
m_peer = new wxMacControl() ; m_peer = new wxMacControl() ;
verify_noerr(CreateGroupBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, CFSTR("") , verify_noerr(CreateGroupBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, CFSTR("") ,
true /*primary*/ , *m_peer ) ) ; true /*primary*/ , m_peer->GetControlRefAddr() ) ) ;
MacPostControlCreate(pos,size) ; MacPostControlCreate(pos,size) ;

2
src/mac/carbon/statlmac.cpp
View File

@@ -57,7 +57,7 @@ bool wxStaticLine::Create( wxWindow *parent,
Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
m_peer = new wxMacControl() ; m_peer = new wxMacControl() ;
verify_noerr(CreateSeparatorControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, *m_peer ) ) ; verify_noerr(CreateSeparatorControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, m_peer->GetControlRefAddr() ) ) ;
MacPostControlCreate(pos,size) ; MacPostControlCreate(pos,size) ;

8
src/mac/carbon/stattext.cpp
View File

@@ -51,7 +51,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ; wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
m_peer = new wxMacControl() ; m_peer = new wxMacControl() ;
verify_noerr(CreateStaticTextControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, str , verify_noerr(CreateStaticTextControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, str ,
NULL , *m_peer ) ) ; NULL , m_peer->GetControlRefAddr() ) ) ;
MacPostControlCreate(pos,size) ; MacPostControlCreate(pos,size) ;
@@ -61,8 +61,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
wxSize wxStaticText::DoGetBestSize() const wxSize wxStaticText::DoGetBestSize() const
{ {
ControlFontStyleRec controlFont ; ControlFontStyleRec controlFont ;
Size outSize ; verify_noerr( m_peer->GetData<ControlFontStyleRec>(kControlEntireControl , kControlFontStyleTag , &controlFont ) ) ;
verify_noerr( GetControlData( *m_peer , kControlEntireControl , kControlFontStyleTag , sizeof(controlFont) , &controlFont , &outSize ) ) ;
Point bounds ; Point bounds ;
SInt16 baseline ; SInt16 baseline ;
@@ -89,8 +88,7 @@ void wxStaticText::SetLabel(const wxString& st )
wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ; wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
CFStringRef ref = str ; CFStringRef ref = str ;
SetControlData( *m_peer, kControlEntireControl , kControlStaticTextCFStringTag, sizeof( CFStringRef ), verify_noerr( m_peer->SetData<CFStringRef>(kControlEntireControl , kControlStaticTextCFStringTag, ref ) ) ;
&ref );
if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
{ {

2
src/mac/carbon/tabctrl.cpp
View File

@@ -58,7 +58,7 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
m_peer = new wxMacControl() ; m_peer = new wxMacControl() ;
verify_noerr ( CreateTabsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , verify_noerr ( CreateTabsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
tabsize , tabstyle, 0, NULL, *m_peer ) ); tabsize , tabstyle, 0, NULL, m_peer->GetControlRefAddr() ) );
MacPostControlCreate(pos,size) ; MacPostControlCreate(pos,size) ;

3577
src/mac/carbon/textctrl.cpp
View File

File diff suppressed because it is too large Load Diff

6
src/mac/carbon/tglbtn.cpp
View File

@@ -67,7 +67,7 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
m_peer = new wxMacControl() ; m_peer = new wxMacControl() ;
verify_noerr ( CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , verify_noerr ( CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") ,
kControlBevelButtonNormalBevel , kControlBehaviorToggles , NULL , 0 , 0 , 0 , *m_peer ) ); kControlBevelButtonNormalBevel , kControlBehaviorToggles , NULL , 0 , 0 , 0 , m_peer->GetControlRefAddr() ) );
MacPostControlCreate(pos,size) ; MacPostControlCreate(pos,size) ;
@@ -89,12 +89,12 @@ wxSize wxToggleButton::DoGetBestSize() const
void wxToggleButton::SetValue(bool val) void wxToggleButton::SetValue(bool val)
{ {
::SetControl32BitValue( *m_peer , val ) ; m_peer->SetValue( val ) ;
} }
bool wxToggleButton::GetValue() const bool wxToggleButton::GetValue() const
{ {
return GetControl32BitValue( *m_peer ) ; return m_peer->GetValue() ;
} }
void wxToggleButton::Command(wxCommandEvent & event) void wxToggleButton::Command(wxCommandEvent & event)

8
src/mac/carbon/toplevel.cpp
View File

@@ -1002,17 +1002,17 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
// There is a bug in 10.2.X for ::GetRootControl returning the window view instead of // There is a bug in 10.2.X for ::GetRootControl returning the window view instead of
// the content view, so we have to retrieve it explicitely // the content view, so we have to retrieve it explicitely
HIViewFindByID( HIViewGetRoot( (WindowRef) m_macWindow ) , kHIViewWindowContentID , HIViewFindByID( HIViewGetRoot( (WindowRef) m_macWindow ) , kHIViewWindowContentID ,
*m_peer ) ; m_peer->GetControlRefAddr() ) ;
if ( !m_peer->Ok() ) if ( !m_peer->Ok() )
{ {
// compatibility mode fallback // compatibility mode fallback
GetRootControl( (WindowRef) m_macWindow , *m_peer ) ; GetRootControl( (WindowRef) m_macWindow , m_peer->GetControlRefAddr() ) ;
} }
#else #else
::CreateRootControl( (WindowRef)m_macWindow , *m_peer ) ; ::CreateRootControl( (WindowRef)m_macWindow , m_peer->GetControlRefAddr() ) ;
#endif #endif
// the root control level handleer // the root control level handleer
MacInstallEventHandler() ; MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() ) ;
// the frame window event handler // the frame window event handler
InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ; InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;

310
src/mac/carbon/utils.cpp
View File

@@ -1435,6 +1435,17 @@ OSStatus wxMacCarbonEvent::SetParameter(EventParamName inName, EventParamType in
// Control Access Support // Control Access Support
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void wxMacControl::Dispose()
{
::DisposeControl( m_controlRef ) ;
m_controlRef = NULL ;
}
void wxMacControl::SetReference( SInt32 data )
{
SetControlReference( m_controlRef , data ) ;
}
OSStatus wxMacControl::GetData(ControlPartCode inPartCode , ResType inTag , Size inBufferSize , void * inOutBuffer , Size * outActualSize ) const OSStatus wxMacControl::GetData(ControlPartCode inPartCode , ResType inTag , Size inBufferSize , void * inOutBuffer , Size * outActualSize ) const
{ {
return ::GetControlData( m_controlRef , inPartCode , inTag , inBufferSize , inOutBuffer , outActualSize ) ; return ::GetControlData( m_controlRef , inPartCode , inTag , inBufferSize , inOutBuffer , outActualSize ) ;
@@ -1521,6 +1532,24 @@ void wxMacControl::SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maxi
::SetControl32BitValue( m_controlRef , value ) ; ::SetControl32BitValue( m_controlRef , value ) ;
} }
OSStatus wxMacControl::SetFocus( ControlFocusPart focusPart )
{
return SetKeyboardFocus( GetControlOwner( m_controlRef ) ,
m_controlRef , focusPart ) ;
}
bool wxMacControl::HasFocus() const
{
ControlRef control ;
GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
return control == m_controlRef ;
}
bool wxMacControl::NeedsFocusRect() const
{
return false ;
}
void wxMacControl::VisibilityChanged(bool shown) void wxMacControl::VisibilityChanged(bool shown)
{ {
} }
@@ -1574,5 +1603,286 @@ void wxMacControl::SetRange( SInt32 minimum , SInt32 maximum )
::SetControl32BitMaximum( m_controlRef , maximum ) ; ::SetControl32BitMaximum( m_controlRef , maximum ) ;
} }
short wxMacControl::HandleKey( SInt16 keyCode, SInt16 charCode, EventModifiers modifiers )
{
return HandleControlKey( m_controlRef , keyCode , charCode , modifiers ) ;
}
void wxMacControl::SetActionProc( ControlActionUPP actionProc )
{
SetControlAction( m_controlRef , actionProc ) ;
}
void wxMacControl::SetViewSize( SInt32 viewSize )
{
SetControlViewSize(m_controlRef , viewSize ) ;
}
SInt32 wxMacControl::GetViewSize() const
{
return GetControlViewSize( m_controlRef ) ;
}
bool wxMacControl::IsVisible() const
{
return IsControlVisible( m_controlRef ) ;
}
void wxMacControl::SetVisibility( bool visible , bool redraw )
{
SetControlVisibility( m_controlRef , visible , redraw ) ;
}
bool wxMacControl::IsEnabled() const
{
#if TARGET_API_MAC_OSX
return IsControlEnabled( m_controlRef ) ;
#else
return IsControlActive( m_controlRef ) ;
#endif
}
bool wxMacControl::IsActive() const
{
return IsControlActive( m_controlRef ) ;
}
void wxMacControl::Enable( bool enable )
{
#if TARGET_API_MAC_OSX
if ( enable )
EnableControl( m_controlRef ) ;
else
DisableControl( m_controlRef ) ;
#else
if ( enable )
ActivateControl( m_controlRef ) ;
else
DeactivateControl( m_controlRef ) ;
#endif
}
void wxMacControl::SetDrawingEnabled( bool enable )
{
#if TARGET_API_MAC_OSX
HIViewSetDrawingEnabled( m_controlRef , enable ) ;
#endif
}
bool wxMacControl::GetNeedsDisplay() const
{
#if TARGET_API_MAC_OSX
return HIViewGetNeedsDisplay( m_controlRef ) ;
#else
return false ;
#endif
}
void wxMacControl::SetNeedsDisplay( bool needsDisplay , RgnHandle where )
{
#if TARGET_API_MAC_OSX
if ( where != NULL )
HIViewSetNeedsDisplayInRegion( m_controlRef , where , needsDisplay ) ;
else
HIViewSetNeedsDisplay( m_controlRef , needsDisplay ) ;
#endif
}
void wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to )
{
#if TARGET_API_MAC_OSX
HIPoint hiPoint ;
hiPoint.x = pt->x ;
hiPoint.y = pt->y ;
HIViewConvertPoint( &hiPoint , from->m_controlRef , to->m_controlRef ) ;
pt->x = hiPoint.x ;
pt->y = hiPoint.y ;
#endif
}
void wxMacControl::SetRect( Rect *r )
{
#if TARGET_API_MAC_OSX
HIRect hir = { r->left , r->top , r->right - r->left , r->bottom - r->top } ;
HIViewSetFrame ( m_controlRef , &hir ) ;
#else
SetControlBounds( m_controlRef , r ) ;
#endif
}
void wxMacControl::GetRect( Rect *r )
{
GetControlBounds( m_controlRef , r ) ;
}
void wxMacControl::GetRectInWindowCoords( Rect *r )
{
UMAGetControlBoundsInWindowCoords( m_controlRef , r ) ;
}
void wxMacControl::GetBestRect( Rect *r )
{
Rect bestsize = { 0 , 0 , 0 , 0 } ;
short baselineoffset ;
GetBestControlRect( m_controlRef , r , &baselineoffset ) ;
}
void wxMacControl::SetTitle( const wxString &title )
{
UMASetControlTitle( m_controlRef , title , m_font.GetEncoding() ) ;
}
void wxMacControl::GetFeatures( UInt32 * features )
{
GetControlFeatures( m_controlRef , features ) ;
}
OSStatus wxMacControl::GetRegion( ControlPartCode partCode , RgnHandle region )
{
return GetControlRegion( m_controlRef , partCode , region ) ;
}
OSStatus wxMacControl::SetZOrder( bool above , wxMacControl* other )
{
#if TARGET_API_MAC_OSX
return HIViewSetZOrder( m_controlRef,above ? kHIViewZOrderAbove : kHIViewZOrderBelow,
(other != NULL) ? other->m_controlRef : NULL) ;
#else
return 0 ;
#endif
}
#if TARGET_API_MAC_OSX
// SetNeedsDisplay would not invalidate the children
static void InvalidateControlAndChildren( HIViewRef control )
{
HIViewSetNeedsDisplay( control , true ) ;
UInt16 childrenCount = 0 ;
OSStatus err = CountSubControls( control , &childrenCount ) ;
if ( err == errControlIsNotEmbedder )
return ;
wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ;
for ( UInt16 i = childrenCount ; i >=1 ; --i )
{
HIViewRef child ;
err = GetIndexedSubControl( control , i , & child ) ;
if ( err == errControlIsNotEmbedder )
return ;
InvalidateControlAndChildren( child ) ;
}
}
#endif
void wxMacControl::InvalidateWithChildren()
{
#if TARGET_API_MAC_OSX
InvalidateControlAndChildren( m_controlRef ) ;
#endif
}
void wxMacControl::ScrollRect( const wxRect &r , int dx , int dy )
{
#if TARGET_API_MAC_OSX
HIRect scrollarea = CGRectMake( r.x , r.y , r.width , r.height) ;
HIViewScrollRect ( m_controlRef , &scrollarea , dx ,dy ) ;
#endif
}
// SetNeedsDisplay would not invalidate the children
//
// Databrowser
//
OSStatus wxMacControl::SetSelectionFlags( DataBrowserSelectionFlags options )
{
return SetDataBrowserSelectionFlags( m_controlRef , options ) ;
}
OSStatus wxMacControl::AddListViewColumn( DataBrowserListViewColumnDesc *columnDesc,
DataBrowserTableViewColumnIndex position )
{
return AddDataBrowserListViewColumn( m_controlRef , columnDesc, position ) ;
}
OSStatus wxMacControl::AutoSizeListViewColumns()
{
return AutoSizeDataBrowserListViewColumns(m_controlRef) ;
}
OSStatus wxMacControl::SetHasScrollBars( bool horiz , bool vert )
{
return SetDataBrowserHasScrollBars( m_controlRef , horiz , vert ) ;
}
OSStatus wxMacControl::SetTableViewHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle )
{
return SetDataBrowserTableViewHiliteStyle( m_controlRef , hiliteStyle ) ;
}
OSStatus wxMacControl::SetListViewHeaderBtnHeight(UInt16 height)
{
return SetDataBrowserListViewHeaderBtnHeight( m_controlRef ,height ) ;
}
OSStatus wxMacControl::SetCallbacks(const DataBrowserCallbacks * callbacks)
{
return SetDataBrowserCallbacks( m_controlRef , callbacks ) ;
}
OSStatus wxMacControl::UpdateItems( DataBrowserItemID container, UInt32 numItems,
const DataBrowserItemID* items,
DataBrowserPropertyID preSortProperty,
DataBrowserPropertyID propertyID )
{
return UpdateDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty, propertyID ) ;
}
bool wxMacControl::IsItemSelected( DataBrowserItemID item )
{
return IsDataBrowserItemSelected( m_controlRef , item ) ;
}
OSStatus wxMacControl::AddItems( DataBrowserItemID container, UInt32 numItems,
const DataBrowserItemID* items,
DataBrowserPropertyID preSortProperty )
{
return AddDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty ) ;
}
OSStatus wxMacControl::RemoveItems( DataBrowserItemID container, UInt32 numItems,
const DataBrowserItemID* items,
DataBrowserPropertyID preSortProperty )
{
return RemoveDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty ) ;
}
OSStatus wxMacControl::RevealItem( DataBrowserItemID item,
DataBrowserPropertyID propertyID,
DataBrowserRevealOptions options )
{
return RevealDataBrowserItem( m_controlRef , item , propertyID , options ) ;
}
OSStatus wxMacControl::SetSelectedItems(UInt32 numItems,
const DataBrowserItemID * items,
DataBrowserSetOption operation )
{
return SetDataBrowserSelectedItems( m_controlRef , numItems , items, operation ) ;
}
//
// Tab Control
//
OSStatus wxMacControl::SetTabEnabled( SInt16 tabNo , bool enable )
{
return ::SetTabEnabled( m_controlRef , tabNo , enable ) ;
}
#endif // wxUSE_GUI #endif // wxUSE_GUI

295
src/mac/carbon/window.cpp
View File

@@ -84,7 +84,8 @@ BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
// TODO EVT_PAINT(wxWindowMac::OnPaint) // TODO EVT_PAINT(wxWindowMac::OnPaint)
EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged) EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged)
EVT_INIT_DIALOG(wxWindowMac::OnInitDialog) EVT_INIT_DIALOG(wxWindowMac::OnInitDialog)
// EVT_SET_FOCUS(wxWindowMac::OnSetFocus) EVT_SET_FOCUS(wxWindowMac::OnSetFocus)
EVT_KILL_FOCUS(wxWindowMac::OnSetFocus)
EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent) EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
END_EVENT_TABLE() END_EVENT_TABLE()
@@ -95,7 +96,7 @@ END_EVENT_TABLE()
#define wxMAC_DEBUG_REDRAW 0 #define wxMAC_DEBUG_REDRAW 0
#endif #endif
#define wxMAC_USE_THEME_BORDER 0 #define wxMAC_USE_THEME_BORDER 1
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// Carbon Events // Carbon Events
@@ -655,8 +656,9 @@ wxWindowMac::~wxWindowMac()
{ {
// in case the callback might be called during destruction // in case the callback might be called during destruction
wxRemoveMacControlAssociation( this) ; wxRemoveMacControlAssociation( this) ;
::SetControlColorProc( *m_peer , NULL ) ; // we currently are not using this hook
::DisposeControl( *m_peer ) ; // ::SetControlColorProc( *m_peer , NULL ) ;
m_peer->Dispose() ;
} }
if ( g_MacLastWindow == this ) if ( g_MacLastWindow == this )
@@ -686,14 +688,14 @@ wxWindowMac::~wxWindowMac()
WXWidget wxWindowMac::GetHandle() const WXWidget wxWindowMac::GetHandle() const
{ {
return (WXWidget) (ControlRef) *m_peer ; return (WXWidget) m_peer->GetControlRef() ;
} }
void wxWindowMac::MacInstallEventHandler() void wxWindowMac::MacInstallEventHandler( WXWidget control )
{ {
wxAssociateControlWithMacControl( *m_peer , this ) ; wxAssociateControlWithMacControl( (ControlRef) control , this ) ;
InstallControlEventHandler( *m_peer, GetwxMacWindowEventHandlerUPP(), InstallControlEventHandler( (ControlRef) control , GetwxMacWindowEventHandlerUPP(),
GetEventTypeCount(eventList), eventList, this, GetEventTypeCount(eventList), eventList, this,
(EventHandlerRef *)&m_macControlEventHandler); (EventHandlerRef *)&m_macControlEventHandler);
@@ -731,27 +733,19 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
; ;
m_peer = new wxMacControl() ; m_peer = new wxMacControl() ;
::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , *m_peer); ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , m_peer->GetControlRefAddr() );
MacPostControlCreate(pos,size) ; MacPostControlCreate(pos,size) ;
#if !TARGET_API_MAC_OSX #if !TARGET_API_MAC_OSX
SetControlData(*m_peer,kControlEntireControl,kControlUserPaneDrawProcTag, m_peer->SetData<ControlUserPaneDrawUPP>(kControlEntireControl,kControlUserPaneDrawProcTag,&gControlUserPaneDrawUPP) ;
sizeof(gControlUserPaneDrawUPP),(Ptr) &gControlUserPaneDrawUPP); m_peer->SetData<ControlUserPaneHitTestUPP>(kControlEntireControl,kControlUserPaneHitTestProcTag,&gControlUserPaneHitTestUPP) ;
SetControlData(*m_peer,kControlEntireControl,kControlUserPaneHitTestProcTag, m_peer->SetData<ControlUserPaneTrackingUPP>(kControlEntireControl,kControlUserPaneTrackingProcTag,&gControlUserPaneTrackingUPP) ;
sizeof(gControlUserPaneHitTestUPP),(Ptr) &gControlUserPaneHitTestUPP); m_peer->SetData<ControlUserPaneIdleUPP>(kControlEntireControl,kControlUserPaneIdleProcTag,&gControlUserPaneIdleUPP) ;
SetControlData(*m_peer,kControlEntireControl,kControlUserPaneTrackingProcTag, m_peer->SetData<ControlUserPaneKeyDownUPP>(kControlEntireControl,kControlUserPaneKeyDownProcTag,&gControlUserPaneKeyDownUPP) ;
sizeof(gControlUserPaneTrackingUPP),(Ptr) &gControlUserPaneTrackingUPP); m_peer->SetData<ControlUserPaneActivateUPP>(kControlEntireControl,kControlUserPaneActivateProcTag,&gControlUserPaneActivateUPP) ;
SetControlData(*m_peer,kControlEntireControl,kControlUserPaneIdleProcTag, m_peer->SetData<ControlUserPaneFocusUPP>(kControlEntireControl,kControlUserPaneFocusProcTag,&gControlUserPaneFocusUPP) ;
sizeof(gControlUserPaneIdleUPP),(Ptr) &gControlUserPaneIdleUPP); m_peer->SetData<ControlUserPaneBackgroundUPP>(kControlEntireControl,kControlUserPaneBackgroundProcTag,&gControlUserPaneBackgroundUPP) ;
SetControlData(*m_peer,kControlEntireControl,kControlUserPaneKeyDownProcTag,
sizeof(gControlUserPaneKeyDownUPP),(Ptr) &gControlUserPaneKeyDownUPP);
SetControlData(*m_peer,kControlEntireControl,kControlUserPaneActivateProcTag,
sizeof(gControlUserPaneActivateUPP),(Ptr) &gControlUserPaneActivateUPP);
SetControlData(*m_peer,kControlEntireControl,kControlUserPaneFocusProcTag,
sizeof(gControlUserPaneFocusUPP),(Ptr) &gControlUserPaneFocusUPP);
SetControlData(*m_peer,kControlEntireControl,kControlUserPaneBackgroundProcTag,
sizeof(gControlUserPaneBackgroundUPP),(Ptr) &gControlUserPaneBackgroundUPP);
#endif #endif
} }
#ifndef __WXUNIVERSAL__ #ifndef __WXUNIVERSAL__
@@ -773,13 +767,13 @@ void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)
{ {
wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ; wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;
::SetControlReference( *m_peer , (long) this ) ; m_peer->SetReference( (long) this ) ;
MacInstallEventHandler(); MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() );
ControlRef container = (ControlRef) GetParent()->GetHandle() ; ControlRef container = (ControlRef) GetParent()->GetHandle() ;
wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ; wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
::EmbedControl( *m_peer , container ) ; ::EmbedControl( m_peer->GetControlRef() , container ) ;
// adjust font, controlsize etc // adjust font, controlsize etc
DoSetWindowVariant( m_windowVariant ) ; DoSetWindowVariant( m_windowVariant ) ;
@@ -789,8 +783,7 @@ void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)
//if ( m_macIsUserPane ) //if ( m_macIsUserPane )
// SetControlColorProc( *m_peer , wxMacSetupControlBackgroundUPP ) ; // SetControlColorProc( *m_peer , wxMacSetupControlBackgroundUPP ) ;
#endif #endif
m_peer->SetTitle( wxStripMenuCodes(m_label) ) ;
UMASetControlTitle( *m_peer , wxStripMenuCodes(m_label) , m_font.GetEncoding() ) ;
if (!m_macIsUserPane) if (!m_macIsUserPane)
{ {
@@ -849,7 +842,7 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
wxFAIL_MSG(_T("unexpected window variant")); wxFAIL_MSG(_T("unexpected window variant"));
break ; break ;
} }
::SetControlData( *m_peer , kControlEntireControl, kControlSizeTag, sizeof( ControlSize ), &size ); m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag,&size ) ;
wxFont font ; wxFont font ;
font.MacCreateThemeFont( themeFont ) ; font.MacCreateThemeFont( themeFont ) ;
@@ -915,7 +908,7 @@ bool wxWindowMac::MacCanFocus() const
// to issue a SetKeyboardFocus event and verify after whether it succeeded, this would risk problems // to issue a SetKeyboardFocus event and verify after whether it succeeded, this would risk problems
// in event handlers... // in event handlers...
UInt32 features = 0 ; UInt32 features = 0 ;
GetControlFeatures( *m_peer , &features ) ; m_peer->GetFeatures( & features ) ;
return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ; return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ;
} }
@@ -927,7 +920,7 @@ void wxWindowMac::SetFocus()
#if !TARGET_API_MAC_OSX #if !TARGET_API_MAC_OSX
wxWindow* former = FindFocus() ; wxWindow* former = FindFocus() ;
#endif #endif
OSStatus err = SetKeyboardFocus( (WindowRef) MacGetTopLevelWindowRef() , (ControlRef) GetHandle() , kControlFocusNextPart ) ; OSStatus err = m_peer->SetFocus( kControlFocusNextPart ) ;
// as we cannot rely on the control features to find out whether we are in full keyboard mode, we can only // as we cannot rely on the control features to find out whether we are in full keyboard mode, we can only
// leave in case of an error // leave in case of an error
if ( err == errCouldntSetFocus ) if ( err == errCouldntSetFocus )
@@ -1008,7 +1001,7 @@ void wxWindowMac::MacGetPositionAndSizeFromControl(int& x, int& y,
int& w, int& h) const int& w, int& h) const
{ {
Rect bounds ; Rect bounds ;
GetControlBounds( *m_peer , &bounds ) ; m_peer->GetRect( &bounds ) ;
x = bounds.left ; x = bounds.left ;
@@ -1031,6 +1024,8 @@ bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos,
int& x, int& y, int& x, int& y,
int& w, int& h , bool adjustOrigin ) const int& w, int& h , bool adjustOrigin ) const
{ {
// the desired size, minus the border pixels gives the correct size of the control
x = (int)pos.x; x = (int)pos.x;
y = (int)pos.y; y = (int)pos.y;
// todo the default calls may be used as soon as PostCreateControl Is moved here // todo the default calls may be used as soon as PostCreateControl Is moved here
@@ -1039,6 +1034,12 @@ bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos,
#if !TARGET_API_MAC_OSX #if !TARGET_API_MAC_OSX
GetParent()->MacWindowToRootWindow( &x , &y ) ; GetParent()->MacWindowToRootWindow( &x , &y ) ;
#endif #endif
x += MacGetLeftBorderSize() ;
y += MacGetTopBorderSize() ;
w -= MacGetLeftBorderSize() + MacGetRightBorderSize() ;
h -= MacGetTopBorderSize() + MacGetBottomBorderSize() ;
if ( adjustOrigin ) if ( adjustOrigin )
AdjustForParentClientOrigin( x , y ) ; AdjustForParentClientOrigin( x , y ) ;
return true ; return true ;
@@ -1047,18 +1048,22 @@ bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos,
// Get total size // Get total size
void wxWindowMac::DoGetSize(int *x, int *y) const void wxWindowMac::DoGetSize(int *x, int *y) const
{ {
#if TARGET_API_MAC_OSX // take the size of the control and add the borders that have to be drawn outside
int x1 , y1 , w1 ,h1 ; int x1 , y1 , w1 ,h1 ;
#if TARGET_API_MAC_OSX
MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ; MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ;
if(x) *x = w1 ;
if(y) *y = h1 ;
#else #else
Rect bounds ; Rect bounds ;
GetControlBounds( *m_peer , &bounds ) ; m_peer->GetRect( &bounds ) ;
if(x) *x = bounds.right - bounds.left ; w1 = bounds.right - bounds.left ;
if(y) *y = bounds.bottom - bounds.top ; h1 = bounds.bottom - bounds.top ;
#endif #endif
w1 += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
h1 += MacGetTopBorderSize() + MacGetBottomBorderSize() ;
if(x) *x = w1 ;
if(y) *y = h1 ;
} }
void wxWindowMac::DoGetPosition(int *x, int *y) const void wxWindowMac::DoGetPosition(int *x, int *y) const
@@ -1066,6 +1071,8 @@ void wxWindowMac::DoGetPosition(int *x, int *y) const
#if TARGET_API_MAC_OSX #if TARGET_API_MAC_OSX
int x1 , y1 , w1 ,h1 ; int x1 , y1 , w1 ,h1 ;
MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ; MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ;
x1 -= MacGetLeftBorderSize() ;
y1 -= MacGetTopBorderSize() ;
if ( !IsTopLevel() ) if ( !IsTopLevel() )
{ {
wxWindow *parent = GetParent(); wxWindow *parent = GetParent();
@@ -1080,11 +1087,13 @@ void wxWindowMac::DoGetPosition(int *x, int *y) const
if(y) *y = y1 ; if(y) *y = y1 ;
#else #else
Rect bounds ; Rect bounds ;
GetControlBounds( *m_peer , &bounds ) ; m_peer->GetRect( &bounds ) ;
wxCHECK_RET( GetParent() , wxT("Missing Parent") ) ; wxCHECK_RET( GetParent() , wxT("Missing Parent") ) ;
int xx = bounds.left ; int xx = bounds.left ;
int yy = bounds.top ; int yy = bounds.top ;
xx -= MacGetLeftBorderSize() ;
yy -= MacGetTopBorderSize() ;
if ( !GetParent()->IsTopLevel() ) if ( !GetParent()->IsTopLevel() )
{ {
@@ -1169,7 +1178,7 @@ void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const
void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const
{ {
#if TARGET_API_MAC_OSX #if TARGET_API_MAC_OSX
HIPoint pt ; wxPoint pt ;
if ( x ) pt.x = *x ; if ( x ) pt.x = *x ;
if ( y ) pt.y = *y ; if ( y ) pt.y = *y ;
@@ -1177,7 +1186,11 @@ void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const
{ {
wxTopLevelWindowMac* top = MacGetTopLevelWindow(); wxTopLevelWindowMac* top = MacGetTopLevelWindow();
if (top) if (top)
HIViewConvertPoint( &pt , *m_peer , (ControlRef) top->GetHandle() ) ; {
pt.x -= MacGetLeftBorderSize() ;
pt.y -= MacGetTopBorderSize() ;
wxMacControl::Convert( &pt , m_peer , top->m_peer ) ;
}
} }
if ( x ) *x = (int) pt.x ; if ( x ) *x = (int) pt.x ;
@@ -1186,7 +1199,7 @@ void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const
if ( !IsTopLevel() ) if ( !IsTopLevel() )
{ {
Rect bounds ; Rect bounds ;
GetControlBounds( *m_peer , &bounds ) ; m_peer->GetRect( &bounds ) ;
if(x) *x += bounds.left ; if(x) *x += bounds.left ;
if(y) *y += bounds.top ; if(y) *y += bounds.top ;
} }
@@ -1206,12 +1219,16 @@ void wxWindowMac::MacWindowToRootWindow( short *x , short *y ) const
void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const
{ {
#if TARGET_API_MAC_OSX #if TARGET_API_MAC_OSX
HIPoint pt ; wxPoint pt ;
if ( x ) pt.x = *x ; if ( x ) pt.x = *x ;
if ( y ) pt.y = *y ; if ( y ) pt.y = *y ;
if ( !IsTopLevel() ) if ( !IsTopLevel() )
HIViewConvertPoint( &pt , (ControlRef) MacGetTopLevelWindow()->GetHandle() , *m_peer ) ; {
wxMacControl::Convert( &pt , MacGetTopLevelWindow()->m_peer , m_peer ) ;
pt.x += MacGetLeftBorderSize() ;
pt.y += MacGetTopBorderSize() ;
}
if ( x ) *x = (int) pt.x ; if ( x ) *x = (int) pt.x ;
if ( y ) *y = (int) pt.y ; if ( y ) *y = (int) pt.y ;
@@ -1219,7 +1236,7 @@ void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const
if ( !IsTopLevel() ) if ( !IsTopLevel() )
{ {
Rect bounds ; Rect bounds ;
GetControlBounds( *m_peer , &bounds ) ; m_peer->GetRect( &bounds ) ;
if(x) *x -= bounds.left ; if(x) *x -= bounds.left ;
if(y) *y -= bounds.top ; if(y) *y -= bounds.top ;
} }
@@ -1240,17 +1257,17 @@ void wxWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , in
{ {
RgnHandle rgn = NewRgn() ; RgnHandle rgn = NewRgn() ;
Rect content ; Rect content ;
if ( GetControlRegion( *m_peer , kControlContentMetaPart , rgn ) == noErr ) if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
{ {
GetRegionBounds( rgn , &content ) ; GetRegionBounds( rgn , &content ) ;
DisposeRgn( rgn ) ; DisposeRgn( rgn ) ;
} }
else else
{ {
GetControlBounds( *m_peer , &content ) ; m_peer->GetRect( &content ) ;
} }
Rect structure ; Rect structure ;
GetControlBounds( *m_peer , &structure ) ; m_peer->GetRect( &structure ) ;
#if !TARGET_API_MAC_OSX #if !TARGET_API_MAC_OSX
OffsetRect( &content , -structure.left , -structure.top ) ; OffsetRect( &content , -structure.left , -structure.top ) ;
#endif #endif
@@ -1268,17 +1285,17 @@ wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size ) const
Rect content ; Rect content ;
if ( GetControlRegion( *m_peer , kControlContentMetaPart , rgn ) == noErr ) if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
{ {
GetRegionBounds( rgn , &content ) ; GetRegionBounds( rgn , &content ) ;
DisposeRgn( rgn ) ; DisposeRgn( rgn ) ;
} }
else else
{ {
GetControlBounds( *m_peer , &content ) ; m_peer->GetRect( &content ) ;
} }
Rect structure ; Rect structure ;
GetControlBounds( *m_peer , &structure ) ; m_peer->GetRect( &structure ) ;
#if !TARGET_API_MAC_OSX #if !TARGET_API_MAC_OSX
OffsetRect( &content , -structure.left , -structure.top ) ; OffsetRect( &content , -structure.left , -structure.top ) ;
#endif #endif
@@ -1300,18 +1317,18 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
RgnHandle rgn = NewRgn() ; RgnHandle rgn = NewRgn() ;
Rect content ; Rect content ;
if ( GetControlRegion( *m_peer , kControlContentMetaPart , rgn ) == noErr ) if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
{ {
GetRegionBounds( rgn , &content ) ; GetRegionBounds( rgn , &content ) ;
DisposeRgn( rgn ) ; DisposeRgn( rgn ) ;
} }
else else
{ {
GetControlBounds( *m_peer , &content ) ; m_peer->GetRect( &content ) ;
} }
#if !TARGET_API_MAC_OSX #if !TARGET_API_MAC_OSX
Rect structure ; Rect structure ;
GetControlBounds( *m_peer , &structure ) ; m_peer->GetRect( &structure ) ;
OffsetRect( &content , -structure.left , -structure.top ) ; OffsetRect( &content , -structure.left , -structure.top ) ;
#endif #endif
ww = content.right - content.left ; ww = content.right - content.left ;
@@ -1479,6 +1496,10 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
DoGetSize( &former_w , &former_h ) ; DoGetSize( &former_w , &former_h ) ;
#else #else
MacGetPositionAndSizeFromControl( former_x , former_y , former_w , former_h ) ; MacGetPositionAndSizeFromControl( former_x , former_y , former_w , former_h ) ;
former_x -= MacGetLeftBorderSize() ;
former_y -= MacGetTopBorderSize() ;
former_w += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
former_h += MacGetTopBorderSize() + MacGetBottomBorderSize() ;
#endif #endif
int actualWidth = width; int actualWidth = width;
@@ -1511,22 +1532,15 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
{ {
// we don't adjust twice for the origin // we don't adjust twice for the origin
Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ; Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ;
bool vis = IsControlVisible( *m_peer ) ; bool vis = m_peer->IsVisible();
#if TARGET_API_MAC_OSX
// the HIViewSetFrame call itself should invalidate the areas, but when testing with the UnicodeTextCtrl it does not ! // the HIViewSetFrame call itself should invalidate the areas, but when testing with the UnicodeTextCtrl it does not !
if ( vis ) if ( vis )
SetControlVisibility( *m_peer , false , true ) ; m_peer->SetVisibility( false , true ) ;
HIRect hir = { r.left , r.top , r.right - r.left , r.bottom - r.top } ; m_peer->SetRect( &r ) ;
HIViewSetFrame ( *m_peer , &hir ) ;
if ( vis ) if ( vis )
SetControlVisibility( *m_peer , true , true ) ; m_peer->SetVisibility( true , true ) ;
#else
if ( vis )
SetControlVisibility( *m_peer , false , true ) ;
SetControlBounds( *m_peer , &r ) ;
if ( vis )
SetControlVisibility( *m_peer , true , true ) ;
#endif
MacRepositionScrollBars() ; MacRepositionScrollBars() ;
if ( doMove ) if ( doMove )
{ {
@@ -1553,13 +1567,11 @@ wxSize wxWindowMac::DoGetBestSize() const
return wxWindowBase::DoGetBestSize() ; return wxWindowBase::DoGetBestSize() ;
Rect bestsize = { 0 , 0 , 0 , 0 } ; Rect bestsize = { 0 , 0 , 0 , 0 } ;
short baselineoffset ;
int bestWidth, bestHeight ; int bestWidth, bestHeight ;
::GetBestControlRect( *m_peer , &bestsize , &baselineoffset ) ; m_peer->GetBestRect( &bestsize ) ;
if ( EmptyRect( &bestsize ) ) if ( EmptyRect( &bestsize ) )
{ {
baselineoffset = 0;
bestsize.left = bestsize.top = 0 ; bestsize.left = bestsize.top = 0 ;
bestsize.right = 16 ; bestsize.right = 16 ;
bestsize.bottom = 16 ; bestsize.bottom = 16 ;
@@ -1583,7 +1595,6 @@ wxSize wxWindowMac::DoGetBestSize() const
bestHeight = 13 ; bestHeight = 13 ;
return wxSize(bestWidth, bestHeight); return wxSize(bestWidth, bestHeight);
// return wxWindowBase::DoGetBestSize() ;
} }
@@ -1662,7 +1673,7 @@ wxPoint wxWindowMac::GetClientAreaOrigin() const
{ {
RgnHandle rgn = NewRgn() ; RgnHandle rgn = NewRgn() ;
Rect content ; Rect content ;
GetControlRegion( *m_peer , kControlContentMetaPart , rgn ) ; m_peer->GetRegion( kControlContentMetaPart , rgn ) ;
GetRegionBounds( rgn , &content ) ; GetRegionBounds( rgn , &content ) ;
DisposeRgn( rgn ) ; DisposeRgn( rgn ) ;
#if !TARGET_API_MAC_OSX #if !TARGET_API_MAC_OSX
@@ -1671,7 +1682,7 @@ wxPoint wxWindowMac::GetClientAreaOrigin() const
if (!::EmptyRect( &content ) ) if (!::EmptyRect( &content ) )
{ {
Rect structure ; Rect structure ;
GetControlBounds( *m_peer , &structure ) ; m_peer->GetRect( &structure ) ;
OffsetRect( &content , -structure.left , -structure.top ) ; OffsetRect( &content , -structure.left , -structure.top ) ;
} }
#endif #endif
@@ -1700,7 +1711,7 @@ void wxWindowMac::SetTitle(const wxString& title)
if ( m_peer && m_peer->Ok() ) if ( m_peer && m_peer->Ok() )
{ {
UMASetControlTitle( *m_peer , m_label , m_font.GetEncoding() ) ; m_peer->SetTitle( m_label ) ;
} }
Refresh() ; Refresh() ;
} }
@@ -1718,7 +1729,7 @@ bool wxWindowMac::Show(bool show)
// TODO use visibilityChanged Carbon Event for OSX // TODO use visibilityChanged Carbon Event for OSX
bool former = MacIsReallyShown() ; bool former = MacIsReallyShown() ;
SetControlVisibility( *m_peer , show , true ) ; m_peer->SetVisibility( show , true ) ;
if ( former != MacIsReallyShown() ) if ( former != MacIsReallyShown() )
MacPropagateVisibilityChanged() ; MacPropagateVisibilityChanged() ;
return TRUE; return TRUE;
@@ -1731,17 +1742,7 @@ bool wxWindowMac::Enable(bool enable)
return FALSE; return FALSE;
bool former = MacIsReallyEnabled() ; bool former = MacIsReallyEnabled() ;
#if TARGET_API_MAC_OSX m_peer->Enable( enable ) ;
if ( enable )
EnableControl( *m_peer ) ;
else
DisableControl( *m_peer ) ;
#else
if ( enable )
ActivateControl( *m_peer ) ;
else
DeactivateControl( *m_peer ) ;
#endif
if ( former != MacIsReallyEnabled() ) if ( former != MacIsReallyEnabled() )
MacPropagateEnabledStateChanged() ; MacPropagateEnabledStateChanged() ;
@@ -1824,7 +1825,7 @@ bool wxWindowMac::MacIsReallyShown()
{ {
// only under OSX the visibility of the TLW is taken into account // only under OSX the visibility of the TLW is taken into account
#if TARGET_API_MAC_OSX #if TARGET_API_MAC_OSX
return IsControlVisible( *m_peer ) ; return m_peer->IsVisible();
#else #else
wxWindow* win = this ; wxWindow* win = this ;
while( win->IsShown() ) while( win->IsShown() )
@@ -1843,16 +1844,12 @@ bool wxWindowMac::MacIsReallyShown()
bool wxWindowMac::MacIsReallyEnabled() bool wxWindowMac::MacIsReallyEnabled()
{ {
#if TARGET_API_MAC_OSX return m_peer->IsEnabled() ;
return IsControlEnabled( *m_peer ) ;
#else
return IsControlActive( *m_peer ) ;
#endif
} }
bool wxWindowMac::MacIsReallyHilited() bool wxWindowMac::MacIsReallyHilited()
{ {
return IsControlActive( *m_peer ) ; return m_peer->IsActive();
} }
void wxWindowMac::MacFlashInvalidAreas() void wxWindowMac::MacFlashInvalidAreas()
@@ -1907,7 +1904,7 @@ void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
{ {
#if TARGET_API_MAC_OSX #if TARGET_API_MAC_OSX
if ( rect == NULL ) if ( rect == NULL )
HIViewSetNeedsDisplay( *m_peer , true ) ; m_peer->SetNeedsDisplay( true ) ;
else else
{ {
RgnHandle update = NewRgn() ; RgnHandle update = NewRgn() ;
@@ -1915,7 +1912,7 @@ void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , update , update ) ; SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , update , update ) ;
wxPoint origin = GetClientAreaOrigin() ; wxPoint origin = GetClientAreaOrigin() ;
OffsetRgn( update, origin.x , origin.y ) ; OffsetRgn( update, origin.x , origin.y ) ;
HIViewSetNeedsDisplayInRegion( *m_peer , update , true ) ; m_peer->SetNeedsDisplay( true , update) ;
} }
#else #else
/* /*
@@ -1932,16 +1929,16 @@ void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
InvalWindowRgn( (WindowRef) MacGetTopLevelWindowRef() , updateRgn ) ; InvalWindowRgn( (WindowRef) MacGetTopLevelWindowRef() , updateRgn ) ;
DisposeRgn(updateRgn) ; DisposeRgn(updateRgn) ;
*/ */
if ( IsControlVisible( *m_peer ) ) if ( m_peer->IsVisible())
{ {
SetControlVisibility( *m_peer , false , false ) ; m_peer->SetVisibility( false , false ) ;
SetControlVisibility( *m_peer , true , true ) ; m_peer->SetVisibility( true , true ) ;
} }
/* /*
if ( MacGetTopLevelWindow() == NULL ) if ( MacGetTopLevelWindow() == NULL )
return ; return ;
if ( !IsControlVisible( *m_peer ) ) if ( !m_peer->IsVisible())
return ; return ;
wxPoint client = GetClientAreaOrigin(); wxPoint client = GetClientAreaOrigin();
@@ -1985,31 +1982,11 @@ void wxWindowMac::Freeze()
#if TARGET_API_MAC_OSX #if TARGET_API_MAC_OSX
if ( !m_frozenness++ ) if ( !m_frozenness++ )
{ {
HIViewSetDrawingEnabled( *m_peer , false ) ; m_peer->SetDrawingEnabled( false ) ;
} }
#endif #endif
} }
#if TARGET_API_MAC_OSX
static void InvalidateControlAndChildren( HIViewRef control )
{
HIViewSetNeedsDisplay( control , true ) ;
UInt16 childrenCount = 0 ;
OSStatus err = CountSubControls( control , &childrenCount ) ;
if ( err == errControlIsNotEmbedder )
return ;
wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ;
for ( UInt16 i = childrenCount ; i >=1 ; --i )
{
HIViewRef child ;
err = GetIndexedSubControl( control , i , & child ) ;
if ( err == errControlIsNotEmbedder )
return ;
InvalidateControlAndChildren( child ) ;
}
}
#endif
void wxWindowMac::Thaw() void wxWindowMac::Thaw()
{ {
@@ -2018,9 +1995,8 @@ void wxWindowMac::Thaw()
if ( !--m_frozenness ) if ( !--m_frozenness )
{ {
HIViewSetDrawingEnabled( *m_peer , true ) ; m_peer->SetDrawingEnabled( true ) ;
InvalidateControlAndChildren( *m_peer ) ; m_peer->InvalidateWithChildren() ;
// HIViewSetNeedsDisplay( *m_peer , true ) ;
} }
#endif #endif
} }
@@ -2028,7 +2004,7 @@ void wxWindowMac::Thaw()
void wxWindowMac::MacRedrawControl() void wxWindowMac::MacRedrawControl()
{ {
/* /*
if ( *m_peer && MacGetTopLevelWindowRef() && IsControlVisible( *m_peer ) ) if ( *m_peer && MacGetTopLevelWindowRef() && m_peer->IsVisible())
{ {
#if TARGET_API_MAC_CARBON #if TARGET_API_MAC_CARBON
Update() ; Update() ;
@@ -2169,18 +2145,14 @@ void wxWindowMac::MacPaintBorders( int left , int top )
int w , h ; int w , h ;
GetSize( &w , &h ) ; GetSize( &w , &h ) ;
Rect rect = { top , left , h + top , w + left } ;
if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
{ {
#if wxMAC_USE_THEME_BORDER #if wxMAC_USE_THEME_BORDER
Rect rect = { top , left , m_height + top , m_width + left } ;
SInt32 border = 0 ; SInt32 border = 0 ;
/* GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;
GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
InsetRect( &rect , border , border ); InsetRect( &rect , border , border );
DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; DrawThemeEditTextFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
*/
DrawThemePrimaryGroup(&rect ,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
#else #else
bool sunken = HasFlag( wxSUNKEN_BORDER ) ; bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
RGBForeColor( &face ); RGBForeColor( &face );
@@ -2287,19 +2259,18 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
// note there currently is a bug in OSX which makes inefficient refreshes in case an entire control // note there currently is a bug in OSX which makes inefficient refreshes in case an entire control
// area is scrolled, this does not occur if width and height are 2 pixels less, // area is scrolled, this does not occur if width and height are 2 pixels less,
// TODO write optimal workaround // TODO write optimal workaround
HIRect scrollrect = CGRectMake( MacGetLeftBorderSize() , MacGetTopBorderSize() , width , height ) ; wxRect scrollrect( MacGetLeftBorderSize() , MacGetTopBorderSize() , MacGetLeftBorderSize() + width , MacGetTopBorderSize() + height ) ;
if ( rect ) if ( rect )
{ {
HIRect scrollarea = CGRectMake( rect->x , rect->y , rect->width , rect->height) ; scrollrect.Intersect( *rect ) ;
scrollrect = CGRectIntersection( scrollrect , scrollarea ) ;
} }
if ( HIViewGetNeedsDisplay( *m_peer ) ) if ( m_peer->GetNeedsDisplay() )
{ {
// becuase HIViewScrollRect does not scroll the already invalidated area we have two options // becuase HIViewScrollRect does not scroll the already invalidated area we have two options
// either immediate redraw or full invalidate // either immediate redraw or full invalidate
#if 1 #if 1
// is the better overall solution, as it does not slow down scrolling // is the better overall solution, as it does not slow down scrolling
HIViewSetNeedsDisplay( *m_peer , true ) ; m_peer->SetNeedsDisplay( true ) ;
#else #else
// this would be the preferred version for fast drawing controls // this would be the preferred version for fast drawing controls
if( UMAGetSystemVersion() < 0x1030 ) if( UMAGetSystemVersion() < 0x1030 )
@@ -2308,7 +2279,7 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
HIViewRender(*m_peer) ; HIViewRender(*m_peer) ;
#endif #endif
} }
HIViewScrollRect ( *m_peer , &scrollrect , dx ,dy ) ; m_peer->ScrollRect( scrollrect , dx , dy ) ;
#else #else
wxPoint pos; wxPoint pos;
@@ -2321,7 +2292,7 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
wxClientDC dc(this) ; wxClientDC dc(this) ;
wxMacPortSetter helper(&dc) ; wxMacPortSetter helper(&dc) ;
GetControlBounds( *m_peer, &scrollrect); m_peer->GetRect( &scrollrect ) ;
scrollrect.top += MacGetTopBorderSize() ; scrollrect.top += MacGetTopBorderSize() ;
scrollrect.left += MacGetLeftBorderSize() ; scrollrect.left += MacGetLeftBorderSize() ;
scrollrect.bottom = scrollrect.top + height ; scrollrect.bottom = scrollrect.top + height ;
@@ -2414,6 +2385,21 @@ void wxWindowMac::OnSetFocus(wxFocusEvent& event)
//wxChildFocusEvent eventFocus(this); //wxChildFocusEvent eventFocus(this);
//(void)GetEventHandler()->ProcessEvent(eventFocus); //(void)GetEventHandler()->ProcessEvent(eventFocus);
if ( MacGetTopLevelWindow() && m_peer->NeedsFocusRect() )
{
wxWindowDC dc(this) ;
wxMacPortSetter helper(&dc) ;
int w , h ;
GetSize( &w , &h ) ;
Rect rect = { dc.m_macLocalOrigin.y , dc.m_macLocalOrigin.x , h + dc.m_macLocalOrigin.y , w + dc.m_macLocalOrigin.x } ;
if ( event.GetEventType() == wxEVT_SET_FOCUS )
DrawThemeFocusRect( &rect , true ) ;
else
DrawThemeFocusRect( &rect , false ) ;
}
event.Skip(); event.Skip();
} }
@@ -2428,17 +2414,13 @@ void wxWindowMac::OnInternalIdle()
// Raise the window to the top of the Z order // Raise the window to the top of the Z order
void wxWindowMac::Raise() void wxWindowMac::Raise()
{ {
#if TARGET_API_MAC_OSX m_peer->SetZOrder( true , NULL ) ;
HIViewSetZOrder(*m_peer,kHIViewZOrderAbove, NULL) ;
#endif
} }
// Lower the window to the bottom of the Z order // Lower the window to the bottom of the Z order
void wxWindowMac::Lower() void wxWindowMac::Lower()
{ {
#if TARGET_API_MAC_OSX m_peer->SetZOrder( false , NULL ) ;
HIViewSetZOrder(*m_peer,kHIViewZOrderBelow, NULL) ;
#endif
} }
@@ -2527,10 +2509,10 @@ void wxWindowMac::Update()
status = ReceiveNextEvent( 0 , NULL , kEventDurationNoWait , false , &theEvent ) ; status = ReceiveNextEvent( 0 , NULL , kEventDurationNoWait , false , &theEvent ) ;
} }
else else
HIViewSetNeedsDisplay( *m_peer , true ) ; m_peer->SetNeedsDisplay( true ) ;
} }
#else #else
::Draw1Control( *m_peer ) ; ::Draw1Control( m_peer->GetControlRef() ) ;
#endif #endif
} }
@@ -2550,9 +2532,14 @@ wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
Rect r ; Rect r ;
RgnHandle visRgn = NewRgn() ; RgnHandle visRgn = NewRgn() ;
RgnHandle tempRgn = NewRgn() ; RgnHandle tempRgn = NewRgn() ;
if ( IsControlVisible( *m_peer ) ) if ( m_peer->IsVisible())
{ {
GetControlBounds( *m_peer , &r ) ; m_peer->GetRect( &r ) ;
r.left -= MacGetLeftBorderSize() ;
r.top -= MacGetTopBorderSize() ;
r.bottom += MacGetBottomBorderSize() ;
r.right += MacGetRightBorderSize() ;
if (! MacGetTopLevelWindow()->MacUsesCompositing() ) if (! MacGetTopLevelWindow()->MacUsesCompositing() )
{ {
MacRootWindowToWindow( &r.left , & r.top ) ; MacRootWindowToWindow( &r.left , & r.top ) ;
@@ -2676,7 +2663,7 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
if ( MacGetTopLevelWindow()->MacUsesCompositing() == false ) if ( MacGetTopLevelWindow()->MacUsesCompositing() == false )
{ {
Rect bounds; Rect bounds;
UMAGetControlBoundsInWindowCoords( *m_peer, &bounds ); m_peer->GetRectInWindowCoords( &bounds );
RgnHandle controlRgn = NewRgn(); RgnHandle controlRgn = NewRgn();
RectRgn( controlRgn, &bounds ); RectRgn( controlRgn, &bounds );
//KO: This sets the ownUpdateRgn to the area of this control that is inside //KO: This sets the ownUpdateRgn to the area of this control that is inside
@@ -2861,7 +2848,7 @@ long wxWindowMac::MacGetLeftBorderSize( ) const
if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER ) if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
{ {
SInt32 border = 3 ; SInt32 border = 3 ;
#if wxMAC_USE_THEME_BORDER #if 0 // wxMAC_USE_THEME_BORDER
GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
#endif #endif
return border ; return border ;
@@ -2869,8 +2856,8 @@ long wxWindowMac::MacGetLeftBorderSize( ) const
else if ( m_windowStyle &wxDOUBLE_BORDER) else if ( m_windowStyle &wxDOUBLE_BORDER)
{ {
SInt32 border = 3 ; SInt32 border = 3 ;
#if wxMAC_USE_THEME_BORDER #if 0 // wxMAC_USE_THEME_BORDER
GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;
#endif #endif
return border ; return border ;
} }