// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
-// Licence: The wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "toolbar.h"
-#endif
-
#include "wx/wxprec.h"
#if wxUSE_TOOLBAR
#include "wx/bitmap.h"
#include "wx/toolbar.h"
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
-
-BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
- EVT_PAINT( wxToolBar::OnPaint )
-END_EVENT_TABLE()
-
#include "wx/mac/uma.h"
#include "wx/geometry.h"
+
#ifdef __WXMAC_OSX__
const short kwxMacToolBarToolDefaultWidth = 16 ;
const short kwxMacToolBarToolDefaultHeight = 16 ;
-const short kwxMacToolBarTopMargin = 4 ; // 1 ; // used to be 4
-const short kwxMacToolBarLeftMargin = 4 ; //1 ; // used to be 4
-const short kwxMacToolBorder = 0 ; // used to be 0
-const short kwxMacToolSpacing = 6 ; // 2 ; // used to be 6
+const short kwxMacToolBarTopMargin = 4 ;
+const short kwxMacToolBarLeftMargin = 4 ;
+const short kwxMacToolBorder = 0 ;
+const short kwxMacToolSpacing = 6 ;
#else
const short kwxMacToolBarToolDefaultWidth = 24 ;
const short kwxMacToolBarToolDefaultHeight = 22 ;
const short kwxMacToolSpacing = 0 ;
#endif
+
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+
+BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
+ EVT_PAINT( wxToolBar::OnPaint )
+END_EVENT_TABLE()
+
+
#pragma mark -
#pragma mark Tool Implementation
wxObject *clientData,
const wxString& shortHelp,
const wxString& longHelp) ;
-
+
wxToolBarTool(wxToolBar *tbar, wxControl *control)
: wxToolBarToolBase(tbar, control)
{
if (control != NULL)
SetControlHandle( (ControlRef) control->GetHandle() ) ;
}
-
+
~wxToolBarTool()
{
- ClearControl() ;
+ ClearControl() ;
if ( m_controlHandle )
DisposeControl( m_controlHandle ) ;
+
#if wxMAC_USE_NATIVE_TOOLBAR
if ( m_toolbarItemRef )
CFRelease( m_toolbarItemRef ) ;
#endif
}
-
- WXWidget GetControlHandle()
- {
- return (WXWidget) m_controlHandle ;
+
+ WXWidget GetControlHandle()
+ {
+ return (WXWidget) m_controlHandle ;
}
-
- void SetControlHandle( ControlRef handle )
- {
- m_controlHandle = handle ;
+
+ void SetControlHandle( ControlRef handle )
+ {
+ m_controlHandle = handle ;
}
void SetPosition( const wxPoint& position ) ;
-
- void ClearControl()
- {
- m_control = NULL ;
+
+ void ClearControl()
+ {
+ m_control = NULL ;
+
#if wxMAC_USE_NATIVE_TOOLBAR
- m_toolbarItemRef = NULL ;
-#endif
+ m_toolbarItemRef = NULL ;
+#endif
}
-
+
wxSize GetSize() const
{
if ( IsControl() )
sz.y /= 4 ;
else
sz.x /= 4 ;
+
return sz ;
}
}
+
wxPoint GetPosition() const
{
return wxPoint(m_x, m_y);
- }
+ }
+
bool DoEnable( bool enable ) ;
-
+
void UpdateToggleImage( bool toggle ) ;
-
-#if wxMAC_USE_NATIVE_TOOLBAR
- void SetToolbarItemRef( HIToolbarItemRef ref )
- {
+
+#if wxMAC_USE_NATIVE_TOOLBAR
+ void SetToolbarItemRef( HIToolbarItemRef ref )
+ {
if ( m_controlHandle )
HideControl( m_controlHandle ) ;
if ( m_toolbarItemRef )
CFRelease( m_toolbarItemRef ) ;
- m_toolbarItemRef = ref ;
+
+ m_toolbarItemRef = ref ;
if ( m_toolbarItemRef )
{
HIToolbarItemSetHelpText(
- m_toolbarItemRef, wxMacCFStringHolder( GetShortHelp() , GetToolBar()->GetFont().GetEncoding() ) ,
- wxMacCFStringHolder( GetLongHelp() , GetToolBar()->GetFont().GetEncoding() ) ) ;
+ m_toolbarItemRef,
+ wxMacCFStringHolder( GetShortHelp(), GetToolBar()->GetFont().GetEncoding() ) ,
+ wxMacCFStringHolder( GetLongHelp(), GetToolBar()->GetFont().GetEncoding() ) ) ;
}
}
- HIToolbarItemRef GetToolbarItemRef() const
- {
- return m_toolbarItemRef ;
+
+ HIToolbarItemRef GetToolbarItemRef() const
+ {
+ return m_toolbarItemRef ;
+ }
+
+ void SetIndex( CFIndex idx )
+ {
+ m_index = idx ;
+ }
+
+ CFIndex GetIndex() const
+ {
+ return m_index ;
}
#endif
private :
- void Init()
+ void Init()
{
m_controlHandle = NULL ;
+
#if wxMAC_USE_NATIVE_TOOLBAR
m_toolbarItemRef = NULL ;
+ m_index = -1 ;
#endif
}
+
ControlRef m_controlHandle ;
+ wxCoord m_x;
+ wxCoord m_y;
+
#if wxMAC_USE_NATIVE_TOOLBAR
HIToolbarItemRef m_toolbarItemRef ;
+ // position in its toolbar, -1 means not inserted
+ CFIndex m_index ;
#endif
- wxCoord m_x;
- wxCoord m_y;
};
static const EventTypeSpec eventList[] =
{
- { kEventClassControl , kEventControlHit } ,
+ { kEventClassControl , kEventControlHit } ,
#ifdef __WXMAC_OSX__
- { kEventClassControl , kEventControlHitTest } ,
+ { kEventClassControl , kEventControlHitTest } ,
#endif
} ;
OSStatus result = eventNotHandledErr ;
wxMacCarbonEvent cEvent( event ) ;
-
+
ControlRef controlRef ;
cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
- switch( GetEventKind( event ) )
+ switch ( GetEventKind( event ) )
{
case kEventControlHit :
{
wxToolBarTool* tbartool = (wxToolBarTool*)data ;
- wxToolBar *tbar = tbartool != NULL ? ( wxToolBar * ) ( tbartool->GetToolBar() ) : NULL ;
- if ((tbartool != NULL) && tbartool->CanBeToggled() )
+ wxToolBar *tbar = tbartool != NULL ? (wxToolBar*) (tbartool->GetToolBar()) : NULL ;
+ if ((tbartool != NULL) && tbartool->CanBeToggled())
{
bool shouldToggle;
+
#ifdef __WXMAC_OSX__
shouldToggle = !tbartool->IsToggled();
#else
shouldToggle = ( GetControl32BitValue((ControlRef) tbartool->GetControlHandle()) != 0 );
#endif
+
tbar->ToggleTool( tbartool->GetId(), shouldToggle );
}
+
if (tbartool != NULL)
tbar->OnLeftClick( tbartool->GetId(), tbartool->IsToggled() );
- result = noErr;
+ result = noErr;
}
break ;
HIPoint pt = cEvent.GetParameter<HIPoint>(kEventParamMouseLocation) ;
HIRect rect ;
HIViewGetBounds( controlRef , &rect ) ;
-
+
ControlPartCode pc = kControlNoPart ;
if ( CGRectContainsPoint( rect , pt ) )
pc = kControlIconPart ;
default :
break ;
}
+
return result ;
}
default :
break ;
}
+
return result ;
}
static const EventTypeSpec toolBarEventList[] =
{
- { kEventClassToolbarItem , kEventToolbarItemPerformAction } ,
+ { kEventClassToolbarItem , kEventToolbarItemPerformAction } ,
} ;
static pascal OSStatus wxMacToolBarCommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
{
OSStatus result = eventNotHandledErr ;
-
- switch( GetEventKind( event ) )
+
+ switch ( GetEventKind( event ) )
{
case kEventToolbarItemPerformAction :
{
wxToolBarTool* tbartool = (wxToolBarTool*) data ;
if ( tbartool != NULL )
{
- int toolID = tbartool->GetId();
- wxToolBar *tbar = ( wxToolBar * ) ( tbartool->GetToolBar() );
+ wxToolBar *tbar = (wxToolBar*)(tbartool->GetToolBar());
+ int toolID = tbartool->GetId();
+
if ( tbartool->CanBeToggled() )
{
- tbar->ToggleTool(toolID, !tbartool->IsToggled() );
+ if ( tbar )
+ tbar->ToggleTool(toolID, !tbartool->IsToggled() );
}
- tbar->OnLeftClick( toolID , tbartool -> IsToggled() ) ;
- result = noErr;
+
+ if ( tbar )
+ tbar->OnLeftClick( toolID , tbartool->IsToggled() ) ;
+ result = noErr;
}
}
break ;
default :
break ;
}
+
return result ;
}
static pascal OSStatus wxMacToolBarEventHandler( EventHandlerCallRef handler, EventRef event, void *data )
{
OSStatus result = eventNotHandledErr ;
- switch( GetEventClass( event ) )
+
+ switch ( GetEventClass( event ) )
{
case kEventClassToolbarItem :
result = wxMacToolBarCommandEventHandler( handler, event, data ) ;
default :
break ;
}
+
return result ;
}
}
else if ( IsButton() )
{
-#if wxMAC_USE_NATIVE_TOOLBAR
+#if wxMAC_USE_NATIVE_TOOLBAR
if ( m_toolbarItemRef )
HIToolbarItemSetEnabled( m_toolbarItemRef , enable ) ;
#endif
#endif
}
}
+
return true ;
}
if ( IsButton() )
{
- Rect contrlRect ;
- GetControlBounds( m_controlHandle , &contrlRect ) ;
+ Rect contrlRect ;
+ GetControlBounds( m_controlHandle , &contrlRect ) ;
int former_mac_x = contrlRect.left ;
int former_mac_y = contrlRect.top ;
GetToolBar()->GetToolSize() ;
-
+
if ( mac_x != former_mac_x || mac_y != former_mac_y )
{
UMAMoveControl( m_controlHandle , mac_x , mac_y ) ;
}
else
{
- // separator
+ // separator
#ifdef __WXMAC_OSX__
- Rect contrlRect ;
- GetControlBounds( m_controlHandle , &contrlRect ) ;
+ Rect contrlRect ;
+ GetControlBounds( m_controlHandle , &contrlRect ) ;
int former_mac_x = contrlRect.left ;
int former_mac_y = contrlRect.top ;
-
+
if ( mac_x != former_mac_x || mac_y != former_mac_y )
- {
UMAMoveControl( m_controlHandle , mac_x , mac_y ) ;
- }
#endif
}
}
-void wxToolBarTool::UpdateToggleImage( bool toggle )
+void wxToolBarTool::UpdateToggleImage( bool toggle )
{
-#if wxMAC_USE_NATIVE_TOOLBAR
+#if wxMAC_USE_NATIVE_TOOLBAR
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4
#define kHIToolbarItemSelected (1 << 7)
int h = m_bmpNormal.GetHeight() ;
wxBitmap bmp( w , h ) ;
wxMemoryDC dc ;
+
dc.SelectObject( bmp ) ;
dc.SetPen( wxNullPen ) ;
dc.SetBackground( *wxWHITE ) ;
dc.DrawRectangle( 0 , 0 , w , h ) ;
- dc.DrawBitmap( m_bmpNormal , 0 , 0 , true) ;
+ dc.DrawBitmap( m_bmpNormal , 0 , 0 , true ) ;
dc.SelectObject( wxNullBitmap ) ;
ControlButtonContentInfo info ;
wxMacCreateBitmapButton( &info , bmp ) ;
- SetControlData( m_controlHandle , 0, kControlIconContentTag, sizeof( info ),
- (Ptr)&info );
+ SetControlData( m_controlHandle, 0, kControlIconContentTag, sizeof(info), (Ptr)&info );
wxMacReleaseBitmapButton( &info ) ;
}
else
{
ControlButtonContentInfo info ;
wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
- SetControlData( m_controlHandle , 0, kControlIconContentTag, sizeof( info ),
- (Ptr)&info );
+ SetControlData( m_controlHandle , 0, kControlIconContentTag,
+ sizeof( info ), (Ptr)&info );
wxMacReleaseBitmapButton( &info ) ;
}
IconTransformType transform = toggle ? kTransformSelected : kTransformNone ;
- SetControlData( m_controlHandle, 0, kControlIconTransformTag, sizeof( transform ),
- (Ptr)&transform );
+ SetControlData( m_controlHandle, 0, kControlIconTransformTag,
+ sizeof( transform ), (Ptr)&transform );
HIViewSetNeedsDisplay( m_controlHandle , true ) ;
#else
m_maxHeight = -1;
m_defaultWidth = kwxMacToolBarToolDefaultWidth;
m_defaultHeight = kwxMacToolBarToolDefaultHeight;
+
#if wxMAC_USE_NATIVE_TOOLBAR
m_macHIToolbarRef = NULL ;
m_macUsesNativeToolbar = false ;
// also for the toolbar we have the dual implementation:
// only when MacInstallNativeToolbar is called is the native toolbar set as the window toolbar
//
-bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
- long style, const wxString& name)
+bool wxToolBar::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name)
{
- if ( !wxToolBarBase::Create( parent , id , pos , size , style ) )
+ if ( !wxToolBarBase::Create( parent , id , pos , size , style, wxDefaultValidator, name ) )
return false ;
- OSStatus err = 0;
+ OSStatus err = noErr;
#if wxMAC_USE_NATIVE_TOOLBAR
- wxString labelStr;
- labelStr.Format(wxT("%xd"), (int)this);
+ wxString labelStr = wxString::Format(wxT("%xd"), (int)this);
err = HIToolbarCreate( wxMacCFStringHolder(labelStr, wxFont::GetDefaultEncoding() ) , 0 ,
(HIToolbarRef*) &m_macHIToolbarRef );
if (m_macHIToolbarRef != NULL)
- {
+ {
HIToolbarDisplayMode mode = kHIToolbarDisplayModeDefault ;
HIToolbarDisplaySize displaySize = kHIToolbarDisplaySizeSmall ;
else
mode = kHIToolbarDisplayModeIconOnly ;
- // FIXME: override for testing
- mode = kHIToolbarDisplayModeIconAndLabel ;
- displaySize = kHIToolbarDisplaySizeDefault ;
-
HIToolbarSetDisplayMode( (HIToolbarRef) m_macHIToolbarRef , mode ) ;
HIToolbarSetDisplaySize( (HIToolbarRef) m_macHIToolbarRef , displaySize ) ;
}
#endif
- return (err == 0);
+ return (err == noErr);
}
wxToolBar::~wxToolBar()
-{
+{
#if wxMAC_USE_NATIVE_TOOLBAR
if ( m_macHIToolbarRef )
{
bool wxToolBar::Show( bool show )
{
- bool bResult, ownToolbarInstalled = false;
+ bool bResult;
WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef());
-
+
bResult = (tlw != NULL);
if (bResult)
{
#if wxMAC_USE_NATIVE_TOOLBAR
+ bool ownToolbarInstalled = false;
MacTopLevelHasNativeToolbar( &ownToolbarInstalled );
if (ownToolbarInstalled)
{
- bResult = (HIViewIsVisible( (HIViewRef)m_macHIToolbarRef ) != show);
- ShowHideWindowToolbar( tlw, show, false );
+ bResult = ( IsWindowToolbarVisible(tlw) != show);
+ if ( bResult )
+ ShowHideWindowToolbar( tlw, show, false );
}
else
#endif
+
bResult = wxToolBarBase::Show( show );
}
-
+
return bResult;
}
bool ownToolbarInstalled ;
MacTopLevelHasNativeToolbar( &ownToolbarInstalled );
if (ownToolbarInstalled)
- bResult = HIViewIsVisible( (HIViewRef)m_macHIToolbarRef );
+ {
+ WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef());
+ bResult = IsWindowToolbarVisible(tlw) ;
+ }
else
#endif
bResult = wxToolBarBase::IsShown();
-
+
return bResult;
}
#if wxMAC_USE_NATIVE_TOOLBAR
Rect boundsR;
bool ownToolbarInstalled;
-
+
MacTopLevelHasNativeToolbar( &ownToolbarInstalled );
if ( ownToolbarInstalled )
{
- // TODO is this really a control ?
+ // TODO: is this really a control ?
GetControlBounds( (ControlRef) m_macHIToolbarRef, &boundsR );
if ( width != NULL )
*width = boundsR.right - boundsR.left;
wxToolBarBase::DoGetSize( width, height );
}
-void wxToolBar::SetWindowStyleFlag( long style )
+wxSize wxToolBar::DoGetBestSize() const
+{
+ int width , height ;
+
+ DoGetSize( &width , &height ) ;
+
+ return wxSize( width , height ) ;
+}
+
+void wxToolBar::SetWindowStyleFlag( long style )
{
wxToolBarBase::SetWindowStyleFlag( style );
+
#if wxMAC_USE_NATIVE_TOOLBAR
if (m_macHIToolbarRef != NULL)
{
mode = kHIToolbarDisplayModeIconAndLabel;
else
mode = kHIToolbarDisplayModeIconOnly;
-
+
HIToolbarSetDisplayMode( (HIToolbarRef) m_macHIToolbarRef, mode );
}
#endif
return bResultV;
}
-bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
+bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
{
- bool bResult = false;
+ bool bResult = false;
WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef());
if (tlw == NULL)
if (usesNative && (m_macHIToolbarRef == NULL))
return bResult;
-
+
if (usesNative && ((GetWindowStyleFlag() & wxTB_VERTICAL) != 0))
return bResult;
-
+
// check the existing toolbar
HIToolbarRef curToolbarRef = NULL;
OSStatus err = GetWindowToolbar( tlw, &curToolbarRef );
- if (err != 0)
+ if (err != noErr)
curToolbarRef = NULL;
m_macUsesNativeToolbar = usesNative;
ShowHideWindowToolbar( tlw, true, false );
ChangeWindowAttributes( tlw, kWindowToolbarButtonAttribute, 0 );
SetAutomaticControlDragTrackingEnabledForWindow( tlw, true );
-
- // FIXME: which is best, which is necessary?
- //
- // m_peer->SetVisibility( false, true );
- //
- //
+
Rect r = { 0 , 0 , 0 , 0 };
- //
- //
m_peer->SetRect( &r );
- //
- // FIXME: which is best, which is necessary?
- //
SetSize( wxSIZE_AUTO_WIDTH, 0 );
- //
m_peer->SetVisibility( false, true );
wxToolBarBase::Show( false );
}
ShowHideWindowToolbar( tlw, false, false );
ChangeWindowAttributes( tlw, 0 , kWindowToolbarButtonAttribute );
SetWindowToolbar( tlw, NULL );
-
- // FIXME: which is best, which is necessary?
+
m_peer->SetVisibility( true, true );
-
- //
- // wxToolBarBase::Show( true );
- //
}
}
if (m_tools.GetCount() == 0)
return false;
- int x = m_xMargin + kwxMacToolBarLeftMargin;
- int y = m_yMargin + kwxMacToolBarTopMargin;
-
- int tw, th;
- GetSize( &tw, &th );
-
int maxWidth = 0;
int maxHeight = 0;
-
+
int maxToolWidth = 0;
int maxToolHeight = 0;
-
+
+ int x = m_xMargin + kwxMacToolBarLeftMargin;
+ int y = m_yMargin + kwxMacToolBarTopMargin;
+
+ int tw, th;
+ GetSize( &tw, &th );
+
// find the maximum tool width and height
wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
while ( node != NULL )
{
wxToolBarTool *tool = (wxToolBarTool *) node->GetData();
-
+
if ( tool != NULL )
{
wxSize sz = tool->GetSize();
-
+
if ( sz.x > maxToolWidth )
maxToolWidth = sz.x;
if ( sz.y > maxToolHeight )
maxToolHeight = sz.y;
}
-
+
node = node->GetNext();
}
-
- bool lastIsRadio = false;
- bool curIsRadio = false;
- bool setChoiceInGroup = false;
-
+
+ bool lastIsRadio = false;
+ bool curIsRadio = false;
+ bool setChoiceInGroup = false;
+
+#if wxMAC_USE_NATIVE_TOOLBAR
+ CFIndex currentPosition = 0 ;
+ bool insertAll = false ;
+#endif
+
node = m_tools.GetFirst();
while ( node != NULL )
{
wxToolBarTool *tool = (wxToolBarTool *) node->GetData();
-
+
if ( tool == NULL )
{
node = node->GetNext();
continue;
}
-
- // set tool position
+
+ // set tool position:
// for the moment just perform a single row/column alignment
wxSize cursize = tool->GetSize();
if ( x + cursize.x > maxWidth )
maxWidth = x + cursize.x;
if ( y + cursize.y > maxHeight )
maxHeight = y + cursize.y;
-
+
if ( GetWindowStyleFlag() & wxTB_VERTICAL )
{
int x1 = x + ( maxToolWidth - cursize.x ) / 2;
int y1 = y + ( maxToolHeight - cursize.y ) / 2;
tool->SetPosition( wxPoint(x, y1) );
}
-
+
// update the item positioning state
if ( GetWindowStyleFlag() & wxTB_VERTICAL )
y += cursize.y + kwxMacToolSpacing;
else
x += cursize.x + kwxMacToolSpacing;
-
+
#if wxMAC_USE_NATIVE_TOOLBAR
// install in native HIToolbar
if ( m_macHIToolbarRef != NULL )
HIToolbarItemRef hiItemRef = tool->GetToolbarItemRef();
if ( hiItemRef != NULL )
{
- OSStatus result = HIToolbarAppendItem( (HIToolbarRef) m_macHIToolbarRef, hiItemRef );
- if ( result == 0 )
+ if ( insertAll || (tool->GetIndex() != currentPosition) )
{
- InstallEventHandler( HIObjectGetEventTarget(hiItemRef), GetwxMacToolBarEventHandlerUPP(),
- GetEventTypeCount(toolBarEventList), toolBarEventList, tool, NULL );
+ OSStatus err = noErr;
+ if ( !insertAll )
+ {
+ insertAll = true;
+
+ // if this is the first tool that gets newly inserted or repositioned
+ // first remove all 'old' tools from here to the right, because of this
+ // all following tools will have to be reinserted (insertAll). i = 100 because there's
+ // no way to determine how many there are in a toolbar, so just a high number :-(
+ for ( CFIndex i = 100 ; i >= currentPosition ; --i )
+ {
+ err = HIToolbarRemoveItemAtIndex( (HIToolbarRef) m_macHIToolbarRef, i );
+ }
+
+ if (err != noErr)
+ {
+ wxString errMsg = wxString::Format( wxT("HIToolbarRemoveItemAtIndex failed [%ld]"), (long)err );
+ wxASSERT_MSG( 0, errMsg.c_str() );
+ }
+ }
+
+ err = HIToolbarInsertItemAtIndex( (HIToolbarRef) m_macHIToolbarRef, hiItemRef, currentPosition );
+ if (err != noErr)
+ {
+ wxString errMsg = wxString::Format( wxT("HIToolbarInsertItemAtIndex failed [%ld]"), (long)err );
+ wxASSERT_MSG( 0, errMsg.c_str() );
+ }
+
+ tool->SetIndex( currentPosition );
}
+
+ currentPosition++;
}
}
#endif
-
+
// update radio button (and group) state
lastIsRadio = curIsRadio;
curIsRadio = ( tool->IsButton() && (tool->GetKind() == wxITEM_RADIO) );
-
+
if ( !curIsRadio )
{
if ( tool->IsToggled() )
DoToggleTool( tool, true );
-
+
setChoiceInGroup = false;
}
else
{
if ( !lastIsRadio )
{
- if ( tool->Toggle(true) )
+ if ( tool->Toggle( true ) )
{
DoToggleTool( tool, true );
setChoiceInGroup = true;
{
if ( tool->IsToggled() )
DoToggleTool( tool, true );
-
+
wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
while ( nodePrev != NULL )
{
wxToolBarToolBase *toggleTool = nodePrev->GetData();
if ( (toggleTool == NULL) || !toggleTool->IsButton() || (toggleTool->GetKind() != wxITEM_RADIO) )
break;
-
- if ( toggleTool->Toggle(false) )
+
+ if ( toggleTool->Toggle( false ) )
DoToggleTool( toggleTool, false );
-
+
nodePrev = nodePrev->GetPrevious();
}
}
}
-
+
node = node->GetNext();
}
-
+
if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
{
// if not set yet, only one row
if ( m_maxRows <= 0 )
SetRows( 1 );
-
+
m_minWidth = maxWidth;
maxWidth = tw;
maxHeight += m_yMargin + kwxMacToolBarTopMargin;
// if not set yet, have one column
if ( (GetToolsCount() > 0) && (m_maxRows <= 0) )
SetRows( GetToolsCount() );
-
+
m_minHeight = maxHeight;
maxHeight = th;
maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
m_minWidth = m_maxWidth = maxWidth;
}
-#if 0
+#if 0
// FIXME: should this be OSX-only?
{
bool wantNativeToolbar, ownToolbarInstalled;
InvalidateBestSize();
}
}
-#else
+#else
SetSize( maxWidth, maxHeight );
InvalidateBestSize();
#endif
+
+ SetBestFittingSize();
+
return true;
}
{
m_defaultWidth = size.x + kwxMacToolBorder;
m_defaultHeight = size.y + kwxMacToolBorder;
-
+
#if wxMAC_USE_NATIVE_TOOLBAR
if (m_macHIToolbarRef != NULL)
{
int maxs = wxMax( size.x, size.y );
- // TODO CHECK
- HIToolbarDisplaySize sizeSpec = ((maxs > 16) ? kHIToolbarDisplaySizeNormal : kHIToolbarDisplaySizeSmall);
+ HIToolbarDisplaySize sizeSpec ;
+ if ( maxs > 32 )
+ sizeSpec = kHIToolbarDisplaySizeNormal ;
+ else if ( maxs > 24 )
+ sizeSpec = kHIToolbarDisplaySizeDefault ;
+ else
+ sizeSpec = kHIToolbarDisplaySizeSmall ;
+
HIToolbarSetDisplaySize( (HIToolbarRef) m_macHIToolbarRef, sizeSpec );
}
#endif
{
// avoid resizing the frame uselessly
if ( nRows != m_maxRows )
- {
m_maxRows = nRows;
- }
}
-void wxToolBar::MacSuperChangedPosition()
+void wxToolBar::MacSuperChangedPosition()
{
wxWindow::MacSuperChangedPosition();
+
#if wxMAC_USE_NATIVE_TOOLBAR
if (! m_macUsesNativeToolbar )
-#endif
- {
Realize();
- }
+#else
+ Realize();
+#endif
}
wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
else
toolrect.right = toolSize.x;
- #ifdef __WXMAC_OSX__
+#ifdef __WXMAC_OSX__
// in flat style we need a visual separator
- #if wxMAC_USE_NATIVE_TOOLBAR
+#if wxMAC_USE_NATIVE_TOOLBAR
HIToolbarItemRef item;
- err = HIToolbarItemCreate( kHIToolbarSeparatorIdentifier, kHIToolbarItemCantBeRemoved | kHIToolbarItemIsSeparator | kHIToolbarItemAllowDuplicates, &item );
+ err = HIToolbarItemCreate(
+ kHIToolbarSeparatorIdentifier,
+ kHIToolbarItemCantBeRemoved | kHIToolbarItemIsSeparator | kHIToolbarItemAllowDuplicates,
+ &item );
if (err == noErr)
tool->SetToolbarItemRef( item );
- #endif
+#endif
+
CreateSeparatorControl( window, &toolrect, &controlHandle );
tool->SetControlHandle( controlHandle );
- #endif
+#endif
}
break;
{
wxASSERT( tool->GetControlHandle() == NULL ) ;
ControlButtonContentInfo info ;
- wxMacCreateBitmapButton( &info , tool->GetNormalBitmap() , kControlContentIconRef ) ;
-
- if ( UMAGetSystemVersion() >= 0x1000)
- CreateIconControl( window , &toolrect , &info , false , &controlHandle ) ;
- else
- {
- SInt16 behaviour = kControlBehaviorOffsetContents ;
- if ( tool->CanBeToggled() )
- behaviour += kControlBehaviorToggles ;
- CreateBevelButtonControl( window , &toolrect , CFSTR("") , kControlBevelButtonNormalBevel , behaviour , &info ,
- 0 , 0 , 0 , &controlHandle ) ;
- }
+ wxMacCreateBitmapButton( &info , tool->GetNormalBitmap() , kControlContentIconRef ) ;
+
+ if ( UMAGetSystemVersion() >= 0x1000)
+ CreateIconControl( window , &toolrect , &info , false , &controlHandle ) ;
+ else
+ {
+ SInt16 behaviour = kControlBehaviorOffsetContents ;
+ if ( tool->CanBeToggled() )
+ behaviour |= kControlBehaviorToggles ;
+ CreateBevelButtonControl( window ,
+ &toolrect , CFSTR("") , kControlBevelButtonNormalBevel ,
+ behaviour , &info , 0 , 0 , 0 , &controlHandle ) ;
+ }
#if wxMAC_USE_NATIVE_TOOLBAR
HIToolbarItemRef item ;
- wxString labelStr;
- labelStr.Format(wxT("%xd"), (int)tool);
+ wxString labelStr = wxString::Format(wxT("%xd"), (int)tool);
err = HIToolbarItemCreate(
wxMacCFStringHolder(labelStr, wxFont::GetDefaultEncoding()),
kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates, &item );
if (err == noErr)
{
+ InstallEventHandler( HIObjectGetEventTarget(item), GetwxMacToolBarEventHandlerUPP(),
+ GetEventTypeCount(toolBarEventList), toolBarEventList, tool, NULL );
HIToolbarItemSetLabel( item, wxMacCFStringHolder(tool->GetLabel(), m_font.GetEncoding()) );
HIToolbarItemSetIconRef( item, info.u.iconRef );
- HIToolbarItemSetCommandID( item, tool->GetId() );
+ HIToolbarItemSetCommandID( item, kHIToolbarCommandPressAction );
tool->SetToolbarItemRef( item );
}
#endif
wxMacReleaseBitmapButton( &info ) ;
- /*
+#if 0
SetBevelButtonTextPlacement( m_controlHandle , kControlBevelButtonPlaceBelowGraphic ) ;
UMASetControlTitle( m_controlHandle , label , wxFont::GetDefaultEncoding() ) ;
- */
-
+#endif
+
InstallControlEventHandler( (ControlRef) controlHandle, GetwxMacToolBarToolEventHandlerUPP(),
GetEventTypeCount(eventList), eventList, tool, NULL );
// FIXME: doesn't work yet...
{
HIToolbarItemRef item;
- wxString labelStr;
- labelStr.Format( wxT("%xd"), (int) tool );
+ wxString labelStr = wxString::Format( wxT("%xd"), (int) tool );
result = HIToolbarItemCreate( wxMacCFStringHolder(labelStr, wxFont::GetDefaultEncoding()),
kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates,
&item );
HIToolbarItemSetLabel( item, wxMacCFStringHolder(tool->GetLabel(), m_font.GetEncoding()) );
HIToolbarItemSetCommandID( item, tool->GetId() );
tool->SetToolbarItemRef( item );
-
+
controlHandle = ( ControlRef ) tool->GetControlHandle();
wxASSERT_MSG( controlHandle != NULL, wxT("NULL tool control") );
-
+
// FIXME: is this necessary ??
::GetControlBounds( controlHandle, &toolrect );
UMAMoveControl( controlHandle, -toolrect.left, -toolrect.top );
-
+
// FIXME: is this necessary ??
InstallControlEventHandler( controlHandle, GetwxMacToolBarToolEventHandlerUPP(),
GetEventTypeCount(eventList), eventList, tool, NULL );
}
}
-
+
#else
// FIXME: right now there's nothing to do here
#endif
default :
break;
}
-
- if ( err == 0 )
+
+ if ( err == noErr )
{
if ( controlHandle )
{
}
else
{
- wxString errMsg;
- errMsg.Format( wxT("wxToolBar::DoInsertTool - failure [%ld]"), (long) err );
+ wxString errMsg = wxString::Format( wxT("wxToolBar::DoInsertTool - failure [%ld]"), (long) err );
wxASSERT_MSG( false, errMsg.c_str() );
}
-
- return( err == 0 );
+
+ return (err == noErr);
}
void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))
tool->Detach();
+#if wxMAC_USE_NATIVE_TOOLBAR
+ CFIndex removeIndex = tool->GetIndex();
+#endif
+
switch ( tool->GetStyle() )
{
case wxTOOL_STYLE_CONTROL:
if ( tool->GetControlHandle() )
{
DisposeControl( (ControlRef) tool->GetControlHandle() ) ;
+
#if wxMAC_USE_NATIVE_TOOLBAR
- if ( tool->GetToolbarItemRef() )
- CFRelease( tool->GetToolbarItemRef() ) ;
+ if ( removeIndex != -1 && m_macHIToolbarRef )
+ {
+ HIToolbarRemoveItemAtIndex( (HIToolbarRef) m_macHIToolbarRef , removeIndex ) ;
+ tool->SetIndex( -1 ) ;
+ }
#endif
+
tool->ClearControl() ;
}
break;
}
// and finally reposition all the controls after this one
-
+
for ( /* node -> first after deleted */ ; node; node = node->GetNext() )
{
wxToolBarTool *tool2 = (wxToolBarTool*) node->GetData();
pt.x -= sz.x ;
tool2->SetPosition( pt ) ;
+
+#if wxMAC_USE_NATIVE_TOOLBAR
+ if ( removeIndex != -1 && tool2->GetIndex() > removeIndex )
+ tool2->SetIndex( tool2->GetIndex() - 1 ) ;
+#endif
}
-
+
InvalidateBestSize();
+
return true ;
}
#if wxMAC_USE_NATIVE_TOOLBAR
if ( m_macUsesNativeToolbar )
{
- event.Skip(true) ;
- return ;
+ event.Skip(true);
+ return;
}
#endif
-
+
wxPaintDC dc(this) ;
int w, h ;
GetSize( &w , &h ) ;
+
+ bool drawMetalTheme = MacGetTopLevelWindow()->MacGetMetalAppearance();
+ bool minimumUmaAvailable = (UMAGetSystemVersion() >= 0x1030);
+
#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
- if ( !MacGetTopLevelWindow()->MacGetMetalAppearance() )
+ if ( !drawMetalTheme && minimumUmaAvailable )
{
- if ( UMAGetSystemVersion() >= 0x1030 )
- {
- HIThemePlacardDrawInfo info ;
- memset( &info, 0 , sizeof( info ) ) ;
- info.version = 0 ;
- info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
-
- CGContextRef cgContext = (CGContextRef) MacGetCGContextRef() ;
- HIRect rect = CGRectMake( 0 , 0 , w , h ) ;
- HIThemeDrawPlacard( &rect , & info , cgContext, kHIThemeOrientationNormal) ;
- }
+ HIThemePlacardDrawInfo info;
+ memset( &info, 0, sizeof(info) );
+ info.version = 0;
+ info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive;
+
+ CGContextRef cgContext = (CGContextRef) MacGetCGContextRef();
+ HIRect rect = CGRectMake( 0, 0, w, h );
+ HIThemeDrawPlacard( &rect, &info, cgContext, kHIThemeOrientationNormal );
}
else
{
// leave the background as it is (striped or metal)
}
+
#else
- wxMacPortSetter helper(&dc) ;
-
- Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) ,
- dc.YLOG2DEVMAC(h) , dc.XLOG2DEVMAC(w) } ;
-/*
- if( toolbarrect.left < 0 )
- toolbarrect.left = 0 ;
- if ( toolbarrect.top < 0 )
- toolbarrect.top = 0 ;
-*/
- if ( !MacGetTopLevelWindow()->MacGetMetalAppearance() )
- {
- UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
- }
- else
+
+ const bool drawBorder = true;
+
+ if (drawBorder)
{
-#if TARGET_API_MAC_OSX
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
- if ( UMAGetSystemVersion() >= 0x1030 )
+ wxMacPortSetter helper(&dc) ;
+
+ if ( !drawMetalTheme || !minimumUmaAvailable )
{
- HIRect hiToolbarrect = CGRectMake( dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) ,
- dc.YLOG2DEVREL(h) , dc.XLOG2DEVREL(w) );
+ Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) ,
+ dc.YLOG2DEVMAC(h) , dc.XLOG2DEVMAC(w) } ;
+
+#if 0
+ if ( toolbarrect.left < 0 )
+ toolbarrect.left = 0 ;
+ if ( toolbarrect.top < 0 )
+ toolbarrect.top = 0 ;
+#endif
+
+ UMADrawThemePlacard( &toolbarrect, IsEnabled() ? kThemeStateActive : kThemeStateInactive );
+ }
+ else
+ {
+#if TARGET_API_MAC_OSX
+ HIRect hiToolbarrect = CGRectMake(
+ dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) ,
+ dc.YLOG2DEVREL(h) , dc.XLOG2DEVREL(w) );
CGContextRef cgContext ;
Rect bounds ;
+
GetPortBounds( (CGrafPtr) dc.m_macPort , &bounds ) ;
QDBeginCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ;
+
CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ;
CGContextScaleCTM( cgContext , 1 , -1 ) ;
- {
- HIThemeBackgroundDrawInfo drawInfo ;
- drawInfo.version = 0 ;
- drawInfo.state = kThemeStateActive ;
- drawInfo.kind = kThemeBackgroundMetal ;
- HIThemeApplyBackground( &hiToolbarrect, &drawInfo , cgContext,kHIThemeOrientationNormal) ;
- }
+ HIThemeBackgroundDrawInfo drawInfo ;
+ drawInfo.version = 0 ;
+ drawInfo.state = kThemeStateActive ;
+ drawInfo.kind = kThemeBackgroundMetal ;
+ HIThemeApplyBackground( &hiToolbarrect, &drawInfo, cgContext, kHIThemeOrientationNormal );
QDEndCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ;
- }
- else
#endif
- {
- UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
}
-#endif
}
#endif
- event.Skip() ;
+ event.Skip();
}
#endif // wxUSE_TOOLBAR
projects / wxWidgets.git / blobdiff