public:
wxToolBarTool(wxToolBar *tbar,
int id,
- const wxBitmap& bitmap1,
- const wxBitmap& bitmap2,
- bool toggle,
+ const wxString& label,
+ const wxBitmap& bmpNormal,
+ const wxBitmap& bmpDisabled,
+ wxItemKind kind,
wxObject *clientData,
- const wxString& shortHelpString,
- const wxString& longHelpString)
- : wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle,
- clientData, shortHelpString, longHelpString)
+ const wxString& shortHelp,
+ const wxString& longHelp)
+ : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
+ clientData, shortHelp, longHelp)
{
m_nSepCount = 0;
m_index = -1 ;
wxToolBarToolBase *wxToolBar::CreateTool(int id,
- const wxBitmap& bitmap1,
- const wxBitmap& bitmap2,
- bool toggle,
+ const wxString& label,
+ const wxBitmap& bmpNormal,
+ const wxBitmap& bmpDisabled,
+ wxItemKind kind,
wxObject *clientData,
- const wxString& shortHelpString,
- const wxString& longHelpString)
+ const wxString& shortHelp,
+ const wxString& longHelp)
{
- return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle,
- clientData, shortHelpString, longHelpString);
+ return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind,
+ clientData, shortHelp, longHelp);
}
wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
return FALSE;
Point localOrigin ;
- Rect clipRect ;
- WindowRef window ;
- wxWindow *win ;
+ // Rect clipRect ;
+ WindowRef window = (WindowRef) MacGetRootWindow() ;
+ // wxWindow *win ;
- GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
+ int lx , ly ;
+ lx = ly = 0 ;
+ MacWindowToRootWindow( &lx , &ly ) ;
+ localOrigin.v = ly ;
+ localOrigin.h = lx ;
+
+// GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
- Rect toolbarrect = { m_y + localOrigin.v , m_x + localOrigin.h ,
- m_y + m_height + localOrigin.v , m_x + m_width + localOrigin.h} ;
+ Rect toolbarrect = { localOrigin.v ,localOrigin.h ,
+ m_height + localOrigin.v , m_width + localOrigin.h} ;
ControlFontStyleRec controlstyle ;
controlstyle.flags = kControlUseFontMask ;
while (node)
{
wxToolBarTool *tool = (wxToolBarTool *)node->Data();
- wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
+ wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
if( !tool->IsSeparator() )
{
toolrect.bottom = toolrect.top + toolSize.y ;
ControlButtonContentInfo info ;
- if ( bmap )
- {
- if ( bmap->m_bitmapType == kMacBitmapTypePict )
- {
- info.contentType = kControlContentPictHandle ;
- info.u.picture = bmap->m_hPict ;
- }
- else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
- {
- if ( tool->GetBitmap1().GetMask() )
- {
- info.contentType = kControlContentCIconHandle ;
- info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , tool->GetBitmap1().GetMask()->GetMaskBitmap() ,
- 8 , 16 ) ;
- }
- else
- {
- info.contentType = kControlContentCIconHandle ;
- info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , NULL ,
- 8 , 16 ) ;
- }
- }
- }
-
+ wxMacCreateBitmapButton( &info , tool->GetNormalBitmap() ) ;
ControlHandle m_macToolHandle ;
SInt16 behaviour = kControlBehaviorOffsetContents ;
if ( tool->CanBeToggled() )
behaviour += kControlBehaviorToggles ;
- if ( info.u.cIconHandle ) // since it is a handle we can use one of them
+ if ( info.contentType != kControlNoContent )
{
m_macToolHandle = ::NewControl( window , &toolrect , "\p" , false , 0 ,
behaviour + info.contentType , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
}
if ( tool->CanBeToggled() && tool->IsToggled() )
{
- ::SetControlValue( m_macToolHandle , 1 ) ;
+ ::SetControl32BitValue( m_macToolHandle , 1 ) ;
}
else
{
- ::SetControlValue( m_macToolHandle , 0 ) ;
+ ::SetControl32BitValue( m_macToolHandle , 0 ) ;
}
/*
::SetControlFontStyle( m_macToolHandle , &controlstyle ) ;
*/
- ControlHandle container = GetParent()->MacGetContainerForEmbedding() ;
+ ControlHandle container = (ControlHandle) GetParent()->MacGetContainerForEmbedding() ;
wxASSERT_MSG( container != NULL , "No valid mac container control" ) ;
::EmbedControl( m_macToolHandle , container ) ;
- if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
+ if ( GetWindowStyleFlag() & wxTB_VERTICAL )
{
- x += (int)toolSize.x;
+ y += (int)toolSize.y;
}
else
{
- y += (int)toolSize.y;
+ x += (int)toolSize.x;
}
noButtons ++;
}
else
{
m_macToolHandles.Add( NULL ) ;
- if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
+
+ if ( GetWindowStyleFlag() & wxTB_VERTICAL )
{
- x += (int)toolSize.x / 4;
+ y += (int)toolSize.y / 4;
}
else
{
- y += (int)toolSize.y / 4;
+ x += (int)toolSize.x / 4;
}
}
if ( toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin - m_x - localOrigin.h > maxWidth) {
return wxSize(m_defaultWidth + 4, m_defaultHeight + 4);
}
-void wxToolBar::MacHandleControlClick( ControlHandle control , SInt16 controlpart )
+void wxToolBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
{
int index = 0 ;
for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
wxToolBarTool *tool = (wxToolBarTool *)m_tools.Nth( index )->Data();
if ( tool->CanBeToggled() )
{
- tool->Toggle( GetControlValue( control ) ) ;
+ tool->Toggle( GetControl32BitValue( (ControlHandle) control ) ) ;
}
OnLeftClick( tool->GetId() , tool -> IsToggled() ) ;
break ;
{
Point localOrigin ;
- Rect clipRect ;
- WindowRef window ;
- wxWindow *win ;
+ // Rect clipRect ;
+ // WindowRef window ;
+ // wxWindow *win ;
+ int lx , ly ;
+ lx = ly = 0 ;
+ MacWindowToRootWindow( &lx , &ly ) ;
+ localOrigin.v = ly ;
+ localOrigin.h = lx ;
- GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
+// GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
- Rect toolbarrect = { m_y + localOrigin.v , m_x + localOrigin.h ,
- m_y + m_height + localOrigin.v , m_x + m_width + localOrigin.h} ;
+ Rect toolbarrect = { localOrigin.v ,localOrigin.h ,
+ m_height + localOrigin.v , m_width + localOrigin.h} ;
ControlFontStyleRec controlstyle ;
controlstyle.flags = kControlUseFontMask ;
int maxHeight = 0 ;
int toolcount = 0 ;
{
- WindowRef rootwindow = GetMacRootWindow() ;
- wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
- ::SetThemeWindowBackground( rootwindow , kThemeBrushDialogBackgroundActive , false ) ;
- wxMacDrawingHelper focus( wxrootwindow ) ;
+ WindowRef rootwindow = (WindowRef) MacGetRootWindow() ;
while (node)
{
wxToolBarTool *tool = (wxToolBarTool *)node->Data();
- wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
+ wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
if( !tool->IsSeparator() )
{
node = node->Next();
}
- if ( wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) )
- {
- }
- else
- {
- ::SetThemeWindowBackground( rootwindow , kThemeBrushDocumentWindowBackground , false ) ;
- }
}
if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
return ;
ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
- ::SetControlValue( control , toggle ) ;
+ ::SetControl32BitValue( control , toggle ) ;
}
bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
void wxToolBar::OnPaint(wxPaintEvent& event)
{
- Point localOrigin ;
- Rect clipRect ;
- WindowRef window ;
- wxWindow *win ;
-
- GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
- if ( window && win )
+ wxPaintDC dc(this) ;
+ wxMacPortSetter helper(&dc) ;
+
+ Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) ,
+ dc.YLOG2DEVMAC(m_height) , dc.XLOG2DEVMAC(m_width) } ;
+ UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
{
- wxMacDrawingHelper help( win ) ;
- // the mac control manager always assumes to have the origin at 0,0
- SetOrigin( 0 , 0 ) ;
-
- bool hasTabBehind = false ;
- wxWindow* parent = GetParent() ;
- while ( parent )
+ int index = 0 ;
+ for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
{
- if( parent->MacGetWindowData() )
+ if ( m_macToolHandles[index] )
{
- ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
- break ;
- }
-
- if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
- {
- if ( ((wxControl*)parent)->GetMacControl() )
- SetUpControlBackground( ((wxControl*)parent)->GetMacControl() , -1 , true ) ;
- break ;
- }
-
- parent = parent->GetParent() ;
- }
-
- Rect toolbarrect = { m_y + localOrigin.v , m_x + localOrigin.h ,
- m_y + localOrigin.v + m_height , m_x + localOrigin.h + m_width } ;
-
- UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
- {
- int index = 0 ;
- for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
- {
- if ( m_macToolHandles[index] )
- {
- UMADrawControl( (ControlHandle) m_macToolHandles[index] ) ;
- }
+ UMADrawControl( (ControlHandle) m_macToolHandles[index] ) ;
}
}
- ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
}
}
void wxToolBar::OnMouse( wxMouseEvent &event )
{
-
if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
{
ControlHandle control ;
Point localwhere ;
- GrafPtr port ;
SInt16 controlpart ;
- WindowRef window = GetMacRootWindow() ;
+ WindowRef window = (WindowRef) MacGetRootWindow() ;
localwhere.h = x ;
localwhere.v = y ;
if ( event.m_metaDown )
modifiers |= cmdKey ;
- controlpart = FindControl( localwhere , window , &control ) ;
+ controlpart = ::FindControl( localwhere , window , &control ) ;
{
if ( control && ::IsControlActive( control ) )
{
projects / wxWidgets.git / blobdiff