/////////////////////////////////////////////////////////////////////////////
// Name: toolbar.cpp
// Purpose: wxToolBar
-// Author: AUTHOR
+// Author: Stefan Csomor
// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) AUTHORy
+// Copyright: (c) Stefan Csomory
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#include "wx/toolbar.h"
#include "wx/notebook.h"
#include "wx/tabctrl.h"
+#include "wx/bitmap.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
- EVT_MOUSE_EVENTS( wxToolBar::OnMouse )
- EVT_PAINT( wxToolBar::OnPaint )
+ EVT_MOUSE_EVENTS( wxToolBar::OnMouse )
+ EVT_PAINT( wxToolBar::OnPaint )
END_EVENT_TABLE()
#endif
-#include <wx/mac/uma.h>
-
+#include "wx/mac/uma.h"
+#include "wx/geometry.h"
// ----------------------------------------------------------------------------
// private classes
// ----------------------------------------------------------------------------
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)
- {
- m_nSepCount = 0;
- m_index = -1 ;
- }
-
+ const wxString& shortHelp,
+ const wxString& longHelp) ;
+
wxToolBarTool(wxToolBar *tbar, wxControl *control)
: wxToolBarToolBase(tbar, control)
{
- m_nSepCount = 1;
- m_index = -1 ;
+ Init() ;
}
+
+ ~wxToolBarTool()
+ {
+ if ( m_controlHandle )
+ DisposeControl( m_controlHandle ) ;
+ }
+
+ ControlHandle GetControlHandle() { return m_controlHandle ; }
+ void SetControlHandle( ControlHandle handle ) { m_controlHandle = handle ; }
- // set/get the number of separators which we use to cover the space used by
- // a control in the toolbar
- void SetSeparatorsCount(size_t count) { m_nSepCount = count; }
- size_t GetSeparatorsCount() const { return m_nSepCount; }
+ void SetSize(const wxSize& size) ;
+ void SetPosition( const wxPoint& position ) ;
+ wxSize GetSize() const
+ {
+ if ( IsControl() )
+ {
+ return GetControl()->GetSize() ;
+ }
+ else if ( IsButton() )
+ {
+ return GetToolBar()->GetToolSize() ;
+ }
+ else
+ {
+ wxSize sz = GetToolBar()->GetToolSize() ;
+ sz.x /= 4 ;
+ sz.y /= 4 ;
+ return sz ;
+ }
+ }
+ wxPoint GetPosition() const
+ {
+ return wxPoint(m_x, m_y);
+ }
+private :
+ void Init()
+ {
+ m_controlHandle = NULL ;
+ }
+ ControlHandle m_controlHandle ;
- int m_index ;
-private:
- size_t m_nSepCount;
+ wxCoord m_x;
+ wxCoord m_y;
};
-
// ============================================================================
// implementation
// ============================================================================
// wxToolBarTool
// ----------------------------------------------------------------------------
-const short defwidth = 24 ;
-const short defheight = 22 ;
+void wxToolBarTool::SetSize(const wxSize& size)
+{
+ if ( IsControl() )
+ {
+ GetControl()->SetSize( size ) ;
+ }
+}
+
+void wxToolBarTool::SetPosition(const wxPoint& position)
+{
+ m_x = position.x;
+ m_y = position.y;
+
+ if ( IsButton() )
+ {
+ int x , y ;
+ x = y = 0 ;
+ WindowRef rootwindow = (WindowRef) GetToolBar()->MacGetRootWindow() ;
+ GetToolBar()->MacWindowToRootWindow( &x , &y ) ;
+ int mac_x = x + position.x ;
+ int mac_y = y + position.y ;
+
+
+ Rect contrlRect ;
+ GetControlBounds( m_controlHandle , &contrlRect ) ;
+ int former_mac_x = contrlRect.left ;
+ int former_mac_y = contrlRect.top ;
+ wxSize sz = GetToolBar()->GetToolSize() ;
+
+ if ( mac_x != former_mac_x || mac_y != former_mac_y )
+ {
+ {
+ Rect inval = { former_mac_y , former_mac_x , former_mac_y + sz.y , former_mac_x + sz.x } ;
+ InvalWindowRect( rootwindow , &inval ) ;
+ }
+ UMAMoveControl( m_controlHandle , mac_x , mac_y ) ;
+ {
+ Rect inval = { mac_y , mac_x , mac_y + sz.y , mac_x + sz.x } ;
+ InvalWindowRect( rootwindow , &inval ) ;
+ }
+ }
+ }
+ else if ( IsControl() )
+ {
+ GetControl()->Move( position ) ;
+ }
+}
+
+const short kwxMacToolBarToolDefaultWidth = 24 ;
+const short kwxMacToolBarToolDefaultHeight = 22 ;
+const short kwxMacToolBarTopMargin = 2 ;
+const short kwxMacToolBarLeftMargin = 2 ;
+
+wxToolBarTool::wxToolBarTool(wxToolBar *tbar,
+ int id,
+ const wxString& label,
+ const wxBitmap& bmpNormal,
+ const wxBitmap& bmpDisabled,
+ wxItemKind kind,
+ wxObject *clientData,
+ const wxString& shortHelp,
+ const wxString& longHelp)
+ : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
+ clientData, shortHelp, longHelp)
+{
+ Init() ;
+
+ WindowRef window = (WindowRef) tbar->MacGetRootWindow() ;
+ wxSize toolSize = tbar->GetToolSize() ;
+ Rect toolrect = { 0, 0 , toolSize.y , toolSize.x } ;
+
+ ControlButtonContentInfo info ;
+ wxMacCreateBitmapButton( &info , GetNormalBitmap() ) ;
+
+ SInt16 behaviour = kControlBehaviorOffsetContents ;
+ if ( CanBeToggled() )
+ behaviour += kControlBehaviorToggles ;
+
+ if ( info.contentType != kControlNoContent )
+ {
+ m_controlHandle = ::NewControl( window , &toolrect , "\p" , false , 0 ,
+ behaviour + info.contentType , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
+
+ ::SetControlData( m_controlHandle , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
+ }
+ else
+ {
+ m_controlHandle = ::NewControl( window , &toolrect , "\p" , false , 0 ,
+ behaviour , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
+ }
+ UMAShowControl( m_controlHandle ) ;
+ if ( !IsEnabled() )
+ {
+ UMADeactivateControl( m_controlHandle ) ;
+ }
+ if ( CanBeToggled() && IsToggled() )
+ {
+ ::SetControl32BitValue( m_controlHandle , 1 ) ;
+ }
+ else
+ {
+ ::SetControl32BitValue( m_controlHandle , 0 ) ;
+ }
+
+ ControlHandle container = (ControlHandle) tbar->MacGetContainerForEmbedding() ;
+ wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
+ ::EmbedControl( m_controlHandle , container ) ;
+}
+
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)
void wxToolBar::Init()
{
- m_maxWidth = -1;
- m_maxHeight = -1;
- m_defaultWidth = defwidth;
- m_defaultHeight = defheight;
- // TODO
+ m_maxWidth = -1;
+ m_maxHeight = -1;
+ m_defaultWidth = kwxMacToolBarToolDefaultWidth;
+ m_defaultHeight = kwxMacToolBarToolDefaultHeight;
}
bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
long style, const wxString& name)
-{
-
- m_defaultWidth = defwidth;
- m_defaultHeight = defheight;
-
- int x = pos.x;
- int y = pos.y;
- int width = size.x;
- int height = size.y;
-
- if (width <= 0)
- width = 100;
- if (height <= 0)
- height = 30;
- if (x < 0)
- x = 0;
- if (y < 0)
- y = 0;
-#if 1
- {
- SetName(name);
-
- m_windowStyle = style;
- parent->AddChild(this);
-
- m_backgroundColour = parent->GetBackgroundColour() ;
- m_foregroundColour = parent->GetForegroundColour() ;
-
- if (id == -1)
- m_windowId = NewControlId();
- else
- m_windowId = id;
-
- m_width = size.x ;
- m_height = size.y ;
- int x = pos.x ;
- int y = pos.y ;
- AdjustForParentClientOrigin(x, y, wxSIZE_USE_EXISTING);
- m_x = x ;
- m_y = y ;
- }
-#else
- Rect bounds ;
- Str255 title ;
-
- MacPreControlCreate( parent , id , "" , wxPoint( x , y ) , wxSize( width , height ) ,style, wxDefaultValidator , name , &bounds , title ) ;
-
- m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , "\p" , true , 0 , 0 , 1,
- kControlPlacardProc , (long) this ) ;
- MacPostControlCreate() ;
-#endif
- return TRUE;
+{
+ int x = pos.x;
+ int y = pos.y;
+ int width = size.x;
+ int height = size.y;
+
+ if (width <= 0)
+ width = 100;
+ if (height <= 0)
+ height = 30;
+ if (x < 0)
+ x = 0;
+ if (y < 0)
+ y = 0;
+
+ SetName(name);
+
+ m_windowStyle = style;
+ parent->AddChild(this);
+
+ m_backgroundColour = parent->GetBackgroundColour() ;
+ m_foregroundColour = parent->GetForegroundColour() ;
+
+ if (id == -1)
+ m_windowId = NewControlId();
+ else
+ m_windowId = id;
+
+ {
+ m_width = size.x ;
+ m_height = size.y ;
+ int x = pos.x ;
+ int y = pos.y ;
+ AdjustForParentClientOrigin(x, y, wxSIZE_USE_EXISTING);
+ m_x = x ;
+ m_y = y ;
+ }
+
+ return TRUE;
}
wxToolBar::~wxToolBar()
-{
+{
// we must refresh the frame size when the toolbar is deleted but the frame
// is not - otherwise toolbar leaves a hole in the place it used to occupy
}
-PicHandle MakePict(GWorldPtr wp, GWorldPtr mask ) ;
-PicHandle MakePict(GWorldPtr wp, GWorldPtr mask )
+bool wxToolBar::Realize()
{
- CGrafPtr origPort ;
- GDHandle origDev ;
-
- PicHandle pict; // this is the Picture we give back
-
- RGBColor gray = { 0xCCCC ,0xCCCC , 0xCCCC } ;
- RGBColor white = { 0xffff ,0xffff , 0xffff } ;
- RGBColor black = { 0x0000 ,0x0000 , 0x0000 } ;
-
- unsigned char *maskimage = NULL ;
- Rect portRect ;
- GetPortBounds( wp , &portRect ) ;
- int width = portRect.right - portRect.left ;
- int height = portRect.bottom - portRect.top ;
-
- LockPixels( GetGWorldPixMap( wp ) ) ;
- GetGWorld( &origPort , &origDev ) ;
-
- if ( mask )
- {
-
- maskimage = (unsigned char*) malloc( width * height ) ;
- SetGWorld( mask , NULL ) ;
- LockPixels( GetGWorldPixMap( mask ) ) ;
- for ( int y = 0 ; y < height ; ++y )
- {
- for( int x = 0 ; x < width ; ++x )
- {
- RGBColor col ;
-
- GetCPixel( x + portRect.left , y + portRect.top , &col ) ;
- maskimage[y*width + x] = ( col.red == 0 ) ; // for monochrome masks
- }
- }
- UnlockPixels( GetGWorldPixMap( mask ) ) ;
- }
-
- SetGWorld( wp , NULL ) ;
-
- pict = OpenPicture(&portRect); // open a picture, this disables drawing
- if(!pict)
- return NULL;
-
- RGBBackColor( &gray ) ;
- RGBForeColor( &black ) ;
- EraseRect(&portRect) ;
- RGBBackColor( &white ) ;
-
- if ( maskimage )
- {
- for ( int y = 0 ; y < height ; ++y )
- {
- for( int x = 0 ; x < width ; ++x )
- {
- if ( maskimage[y*width + x] )
- {
- RGBColor col ;
-
- GetCPixel( x + portRect.left , y + portRect.top , &col ) ;
- SetCPixel( x + portRect.left , y + portRect.top , &col ) ;
- }
- }
- }
- free( maskimage ) ;
- maskimage = NULL ;
- }
- else
- {
- CopyBits(GetPortBitMapForCopyBits(wp), // src PixMap - we copy image over itself -
- GetPortBitMapForCopyBits(wp), // dst PixMap - no drawing occurs -
- &portRect, // srcRect - it will be recorded and compressed -
- &portRect, // dstRect - into the picture that is open -
- srcCopy,NULL); // copyMode and no clip region
-
- }
- ClosePicture(); // We are done recording the picture
- UnlockPixels( GetGWorldPixMap( wp ) ) ;
- SetGWorld( origPort , origDev ) ;
- return pict; // return our groovy pict handle
-}
+ if (m_tools.GetCount() == 0)
+ return FALSE;
-const short kwxMacToolBarTopMargin = 2 ;
-const short kwxMacToolBarLeftMargin = 2 ;
+ int x = m_xMargin + kwxMacToolBarLeftMargin ;
+ int y = m_yMargin + kwxMacToolBarTopMargin ;
-bool wxToolBar::Realize()
-{
- if (m_tools.Number() == 0)
- return FALSE;
-
- Point localOrigin ;
- Rect clipRect ;
- WindowRef window ;
- wxWindow *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} ;
- ControlFontStyleRec controlstyle ;
-
- controlstyle.flags = kControlUseFontMask ;
- controlstyle.font = kControlFontSmallSystemFont ;
-
- wxNode *node = m_tools.First();
- int noButtons = 0;
- int x = 0 ;
- wxSize toolSize = GetToolSize() ;
int tw, th;
GetSize(& tw, & th);
- m_maxWidth = m_maxHeight = 0 ;
- while (node)
- {
- wxToolBarTool *tool = (wxToolBarTool *)node->Data();
- wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
-
- if( !tool->IsSeparator() )
- {
- Rect toolrect = { toolbarrect.top + kwxMacToolBarTopMargin , toolbarrect.left + x + kwxMacToolBarLeftMargin , 0 , 0 } ;
- toolrect.right = toolrect.left + toolSize.x ;
- toolrect.bottom = toolrect.top + toolSize.y ;
-
- PicHandle icon = NULL ;
- if ( bmap )
- {
- if ( bmap->m_bitmapType == kMacBitmapTypePict )
- icon = bmap->m_hPict ;
- else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
- {
- if ( tool->GetBitmap1().GetMask() )
- {
- icon = MakePict( bmap->m_hBitmap , tool->GetBitmap1().GetMask()->GetMaskBitmap() ) ;
- }
- else
- {
- icon = MakePict( bmap->m_hBitmap , NULL ) ;
- }
- }
- }
-
- ControlHandle m_macToolHandle ;
-
- SInt16 behaviour = kControlBehaviorOffsetContents ;
- if ( tool->CanBeToggled() )
- behaviour += kControlBehaviorToggles ;
-
- if ( icon )
- {
- m_macToolHandle = UMANewControl( window , &toolrect , "\p" , true , 0 ,
- behaviour + kControlContentPictHandle , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
- ControlButtonContentInfo info ;
-
- info.contentType = kControlContentPictHandle ;
- info.u.picture = icon ;
-
- UMASetControlData( m_macToolHandle , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
- }
- else
- {
- m_macToolHandle = UMANewControl( window , &toolrect , "\p" , true , 0 ,
- behaviour , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
- }
- m_macToolHandles.Add( m_macToolHandle ) ;
- tool->m_index = m_macToolHandles.Count() -1 ;
- if ( !tool->IsEnabled() )
- {
- UMADeactivateControl( m_macToolHandle ) ;
- }
- if ( tool->CanBeToggled() && tool->IsToggled() )
- {
- ::SetControlValue( m_macToolHandle , 1 ) ;
- }
- UMASetControlFontStyle( m_macToolHandle , &controlstyle ) ;
- ControlHandle container = GetParent()->MacGetContainerForEmbedding() ;
- wxASSERT_MSG( container != NULL , "No valid mac container control" ) ;
- UMAEmbedControl( m_macToolHandle , container ) ;
-
- x += (int)toolSize.x;
- noButtons ++;
- }
- else
- {
- m_macToolHandles.Add( NULL ) ;
- x += (int)toolSize.x / 4;
- }
- if ( toolbarrect.left + x + kwxMacToolBarLeftMargin - m_x - localOrigin.h > m_maxWidth)
- m_maxWidth = toolbarrect.left + x + kwxMacToolBarLeftMargin - m_x - localOrigin.h;
- if (toolbarrect.top + kwxMacToolBarTopMargin - m_y - localOrigin.v > m_maxHeight)
- m_maxHeight = toolbarrect.top + kwxMacToolBarTopMargin - m_y - localOrigin.v ;
-
- node = node->Next();
- }
-
- if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
- {
- if ( m_maxRows == 0 )
+
+ int maxWidth = 0 ;
+ int maxHeight = 0 ;
+
+ int maxToolWidth = 0;
+ int maxToolHeight = 0;
+
+ // Find the maximum tool width and height
+ wxToolBarToolsList::Node *node = m_tools.GetFirst();
+ while ( node )
{
- // if not set yet, only one row
- SetRows(1);
- }
- m_maxWidth = clipRect.right - m_x ;
- //m_maxWidth = tw ; // +=toolSize.x;
- //m_maxWidth += m_xMargin ;
- m_maxHeight += toolSize.y;
- m_maxHeight += m_yMargin;
- }
- else
- {
- if ( noButtons > 0 && m_maxRows == 0 )
- {
- // if not set yet, have one column
- SetRows(noButtons);
+ wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
+ wxSize sz = tool->GetSize() ;
+
+ if ( sz.x > maxToolWidth )
+ maxToolWidth = sz.x ;
+ if (sz.y> maxToolHeight)
+ maxToolHeight = sz.y;
+
+ node = node->GetNext();
}
- m_maxHeight = clipRect.bottom - m_y ;
- //m_maxHeight += m_yMargin ;
- m_maxWidth += toolSize.x;
- m_maxWidth += m_xMargin;
- }
- SetSize(m_maxWidth, m_maxHeight);
+ int separatorSize = GetToolSize().x / 4 ;
- return TRUE;
+ node = m_tools.GetFirst();
+ while (node)
+ {
+ wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
+ wxSize cursize = tool->GetSize() ;
+
+ // for the moment we just do a single row/column alignement
+ if ( x + cursize.x > maxWidth )
+ maxWidth = x + cursize.x ;
+ if ( y + cursize.y > maxHeight )
+ maxHeight = y + cursize.y ;
+
+ tool->SetPosition( wxPoint( x , y ) ) ;
+
+ if ( GetWindowStyleFlag() & wxTB_VERTICAL )
+ {
+ y += cursize.y ;
+ }
+ else
+ {
+ x += cursize.x ;
+ }
+
+ node = node->GetNext();
+ }
+
+ if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
+ {
+ if ( m_maxRows == 0 )
+ {
+ // if not set yet, only one row
+ SetRows(1);
+ }
+ maxWidth = tw ;
+ maxHeight += m_yMargin + kwxMacToolBarTopMargin;
+ m_maxHeight = maxHeight ;
+ }
+ else
+ {
+ if ( GetToolsCount() > 0 && m_maxRows == 0 )
+ {
+ // if not set yet, have one column
+ SetRows(GetToolsCount());
+ }
+ maxHeight = th ;
+ maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
+ m_maxWidth = maxWidth ;
+ }
+
+ SetSize(maxWidth, maxHeight);
+
+ return TRUE;
}
void wxToolBar::SetToolBitmapSize(const wxSize& size)
{
- m_defaultWidth = size.x; m_defaultHeight = size.y;
+ m_defaultWidth = size.x+4; m_defaultHeight = size.y+4;
}
// The button size is bigger than the bitmap size
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 )
- {
- if ( m_macToolHandles[index] == (void*) control )
- {
- wxToolBarTool *tool = (wxToolBarTool *)m_tools.Nth( index )->Data();
- if ( tool->CanBeToggled() )
- {
- tool->Toggle( GetControlValue( control ) ) ;
- }
- OnLeftClick( tool->GetId() , tool -> IsToggled() ) ;
- break ;
- }
- }
+ wxToolBarToolsList::Node *node;
+ for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+ {
+ wxToolBarTool* tool = (wxToolBarTool*) node->GetData() ;
+ if ( tool->IsButton() )
+ {
+ if( tool->GetControlHandle() == control )
+ {
+ if ( tool->CanBeToggled() )
+ {
+ tool->Toggle( GetControl32BitValue( (ControlHandle) control ) ) ;
+ }
+ OnLeftClick( tool->GetId() , tool -> IsToggled() ) ;
+ break ;
+ }
+ }
+ }
}
void wxToolBar::SetRows(int nRows)
m_maxRows = nRows;
}
+void wxToolBar::MacSuperChangedPosition()
+{
+ wxWindow::MacSuperChangedPosition() ;
+ Realize() ;
+}
+
wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
{
- MacClientToRootWindow( &x , &y ) ;
- Point pt = { y ,x } ;
-
- int index = 0 ;
- for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
- {
- if ( m_macToolHandles[index] )
- {
- Rect bounds ;
- GetControlBounds((ControlHandle) m_macToolHandles[index], &bounds ) ;
- if ( PtInRect( pt , &bounds ) )
- {
- return (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ;
- }
- }
- }
+ wxToolBarToolsList::Node *node = m_tools.GetFirst();
+ while (node)
+ {
+ wxToolBarTool *tool = (wxToolBarTool *)node->GetData() ;
+ wxRect2DInt r( tool->GetPosition() , tool->GetSize() ) ;
+ if ( r.Contains( wxPoint( x , y ) ) )
+ {
+ return tool;
+ }
+
+ node = node->GetNext();
+ }
return (wxToolBarToolBase *)NULL;
}
wxString wxToolBar::MacGetToolTipString( wxPoint &pt )
{
- wxToolBarToolBase* tool = FindToolForPosition( pt.x , pt.y ) ;
- if ( tool )
- {
- return tool->GetShortHelp() ;
- }
- return "" ;
+ wxToolBarToolBase* tool = FindToolForPosition( pt.x , pt.y ) ;
+ if ( tool )
+ {
+ return tool->GetShortHelp() ;
+ }
+ return wxEmptyString ;
}
void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
{
- wxToolBarTool *tool = (wxToolBarTool *)t;
- if ( tool->m_index < 0 )
- return ;
-
- ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
-
- if ( enable )
- UMAActivateControl( control ) ;
- else
- UMADeactivateControl( control ) ;
+ if (!IsShown())
+ return ;
+
+ wxToolBarTool *tool = (wxToolBarTool *)t;
+ if ( tool->IsControl() )
+ {
+ tool->GetControl()->Enable( enable ) ;
+ }
+ else if ( tool->IsButton() )
+ {
+ if ( enable )
+ UMAActivateControl( tool->GetControlHandle() ) ;
+ else
+ UMADeactivateControl( tool->GetControlHandle() ) ;
+ }
}
void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
{
- wxToolBarTool *tool = (wxToolBarTool *)t;
- if ( tool->m_index < 0 )
- return ;
-
- ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
- ::SetControlValue( control , toggle ) ;
+ if (!IsShown())
+ return ;
+
+ wxToolBarTool *tool = (wxToolBarTool *)t;
+ if ( tool->IsButton() )
+ {
+ ::SetControl32BitValue( tool->GetControlHandle() , toggle ) ;
+ }
}
bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
wxToolBarToolBase *tool)
{
- // nothing special to do here - we really create the toolbar buttons in
- // Realize() later
+ // nothing special to do here - we relayout in Realize() later
tool->Attach(this);
return TRUE;
}
-void wxToolBar::DoSetToggle(wxToolBarToolBase *t, bool toggle)
+void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))
{
- wxToolBarTool *tool = (wxToolBarTool *)t;
- // TODO: set toggle state
+ wxFAIL_MSG( _T("not implemented") );
}
-bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
+bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
{
- return TRUE ;
+ wxToolBarToolsList::Node *node;
+ for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+ {
+ wxToolBarToolBase *tool2 = node->GetData();
+ if ( tool2 == tool )
+ {
+ // let node point to the next node in the list
+ node = node->GetNext();
+
+ break;
+ }
+ }
+
+ wxSize sz = ((wxToolBarTool*)tool)->GetSize() ;
+
+ tool->Detach();
+
+ // and finally reposition all the controls after this one
+
+ for ( /* node -> first after deleted */ ; node; node = node->GetNext() )
+ {
+ wxToolBarTool *tool2 = (wxToolBarTool*) node->GetData();
+ wxPoint pt = tool2->GetPosition() ;
+
+ if ( GetWindowStyleFlag() & wxTB_VERTICAL )
+ {
+ pt.y -= sz.y ;
+ }
+ else
+ {
+ pt.x -= sz.x ;
+ }
+ tool2->SetPosition( pt ) ;
+ }
+
+ return TRUE ;
}
void wxToolBar::OnPaint(wxPaintEvent& event)
{
- Point localOrigin ;
- Rect clipRect ;
- WindowRef window ;
- wxWindow *win ;
-
- GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
- if ( window && win )
- {
- 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 )
- {
- if( parent->MacGetWindowData() )
- {
- UMASetThemeWindowBackground( 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() ;
- }
- int w = m_width ;
- int h = m_height ;
-
- if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
- {
- w = clipRect.right - m_x ;
- }
- else
- {
- h = clipRect.bottom - m_y ;
- }
-
- Rect toolbarrect = { m_y + localOrigin.v , m_x + localOrigin.h ,
- m_y + localOrigin.v + h , m_x + localOrigin.h + w } ;
-
- 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] ) ;
- }
- }
- }
- UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
- wxDC::MacInvalidateSetup() ;
- }
- /*
- WindowRef window = GetMacRootWindow() ;
- if ( window )
- {
- wxWindow* win = wxFindWinFromMacWindow( window ) ;
- if ( win )
- {
- 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 )
- {
- if( parent->MacGetWindowData() )
- {
- UMASetThemeWindowBackground( 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 , m_x , m_y + m_height , m_x + 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] ) ;
- }
- }
- }
- UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
- wxDC::MacInvalidateSetup() ;
- }
- }
- */
+ 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) ;
+ {
+ wxToolBarToolsList::Node *node;
+ for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+ {
+ wxToolBarTool* tool = (wxToolBarTool*) node->GetData() ;
+ if ( tool->IsButton() )
+ {
+ UMADrawControl( tool->GetControlHandle() ) ;
+ }
+ }
+ }
}
+
void wxToolBar::OnMouse( wxMouseEvent &event )
{
-
- if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
- {
-
- int x = event.m_x ;
- int y = event.m_y ;
-
- MacClientToRootWindow( &x , &y ) ;
-
- ControlHandle control ;
- Point localwhere ;
- GrafPtr port ;
- SInt16 controlpart ;
- WindowRef window = GetMacRootWindow() ;
-
- localwhere.h = x ;
- localwhere.v = y ;
-
- short modifiers = 0;
-
- if ( !event.m_leftDown && !event.m_rightDown )
- modifiers |= btnState ;
-
- if ( event.m_shiftDown )
- modifiers |= shiftKey ;
-
- if ( event.m_controlDown )
- modifiers |= controlKey ;
-
- if ( event.m_altDown )
- modifiers |= optionKey ;
-
- if ( event.m_metaDown )
- modifiers |= cmdKey ;
-
- controlpart = FindControl( localwhere , window , &control ) ;
- {
- if ( AcceptsFocus() && FindFocus() != this )
- {
- SetFocus() ;
- }
- if ( control && UMAIsControlActive( control ) )
- {
- {
- if ( controlpart == kControlIndicatorPart && !UMAHasAppearance() )
- controlpart = UMAHandleControlClick( control , localwhere , modifiers , (ControlActionUPP) NULL ) ;
- else
- controlpart = UMAHandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ;
- wxTheApp->s_lastMouseDown = 0 ;
- if ( controlpart && ! ( ( UMAHasAppearance() || (controlpart != kControlIndicatorPart) )
- && (IsKindOf( CLASSINFO( wxScrollBar ) ) ) ) ) // otherwise we will get the event twice
- {
- MacHandleControlClick( control , controlpart ) ;
- }
- }
- }
- }
- }
+ if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
+ {
+
+ int x = event.m_x ;
+ int y = event.m_y ;
+
+ MacClientToRootWindow( &x , &y ) ;
+
+ ControlHandle control ;
+ Point localwhere ;
+ SInt16 controlpart ;
+ WindowRef window = (WindowRef) MacGetRootWindow() ;
+
+ localwhere.h = x ;
+ localwhere.v = y ;
+
+ short modifiers = 0;
+
+ if ( !event.m_leftDown && !event.m_rightDown )
+ modifiers |= btnState ;
+
+ if ( event.m_shiftDown )
+ modifiers |= shiftKey ;
+
+ if ( event.m_controlDown )
+ modifiers |= controlKey ;
+
+ if ( event.m_altDown )
+ modifiers |= optionKey ;
+
+ if ( event.m_metaDown )
+ modifiers |= cmdKey ;
+
+ controlpart = ::FindControl( localwhere , window , &control ) ;
+ {
+ if ( control && ::IsControlActive( control ) )
+ {
+ {
+ if ( controlpart == kControlIndicatorPart && !UMAHasAppearance() )
+ controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) NULL ) ;
+ else
+ controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ;
+ wxTheApp->s_lastMouseDown = 0 ;
+ if ( controlpart && ! ( ( UMAHasAppearance() || (controlpart != kControlIndicatorPart) )
+ && (IsKindOf( CLASSINFO( wxScrollBar ) ) ) ) ) // otherwise we will get the event twice
+ {
+ MacHandleControlClick( control , controlpart ) ;
+ }
+ }
+ }
+ }
+ }
}
#endif // wxUSE_TOOLBAR
projects / wxWidgets.git / blobdiff