#include "wx/toolbar.h"
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
END_EVENT_TABLE()
-#endif
#include <wx/mac/uma.h>
-wxToolBar::wxToolBar()
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+class wxToolBarTool : public wxToolBarToolBase
+{
+public:
+ wxToolBarTool(wxToolBar *tbar,
+ int id,
+ const wxBitmap& bitmap1,
+ const wxBitmap& bitmap2,
+ bool toggle,
+ wxObject *clientData,
+ const wxString& shortHelpString,
+ const wxString& longHelpString)
+ : wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle,
+ clientData, shortHelpString, longHelpString)
+ {
+ m_nSepCount = 0;
+ m_index = 0 ;
+ }
+
+ wxToolBarTool(wxToolBar *tbar, wxControl *control)
+ : wxToolBarToolBase(tbar, control)
+ {
+ m_nSepCount = 1;
+ m_index = 0 ;
+ }
+
+ // 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; }
+
+ int m_index ;
+private:
+ size_t m_nSepCount;
+};
+
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxToolBarTool
+// ----------------------------------------------------------------------------
+
+wxToolBarToolBase *wxToolBar::CreateTool(int id,
+ const wxBitmap& bitmap1,
+ const wxBitmap& bitmap2,
+ bool toggle,
+ wxObject *clientData,
+ const wxString& shortHelpString,
+ const wxString& longHelpString)
+{
+ return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle,
+ clientData, shortHelpString, longHelpString);
+}
+
+wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
+{
+ return new wxToolBarTool(this, control);
+}
+
+// ----------------------------------------------------------------------------
+// wxToolBar construction
+// ----------------------------------------------------------------------------
+
+void wxToolBar::Init()
{
m_maxWidth = -1;
m_maxHeight = -1;
bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
long style, const wxString& name)
{
- m_maxWidth = -1;
- m_maxHeight = -1;
+ m_maxWidth = m_maxHeight = 0;
m_defaultWidth = 24;
m_defaultHeight = 22;
const short kwxMacToolBarTopMargin = 2 ;
const short kwxMacToolBarLeftMargin = 2 ;
-bool wxToolBar::CreateTools()
+bool wxToolBar::Realize()
{
if (m_tools.Number() == 0)
return FALSE;
wxNode *node = m_tools.First();
int noButtons = 0;
int x = 0 ;
-
+ wxSize toolSize = GetToolSize() ;
+ int tw, th;
+ GetSize(& tw, & th);
while (node)
{
wxToolBarTool *tool = (wxToolBarTool *)node->Data();
- wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->m_bitmap1.GetRefData()) ;
+ wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
- if( tool->m_toolStyle != wxTOOL_STYLE_SEPARATOR )
+ if( !tool->IsSeparator() )
{
Rect toolrect = { toolbarrect.top + kwxMacToolBarTopMargin , toolbarrect.left + x + kwxMacToolBarLeftMargin , 0 , 0 } ;
- toolrect.right = toolrect.left + m_defaultWidth ;
- toolrect.bottom = toolrect.top + m_defaultHeight ;
+ toolrect.right = toolrect.left + toolSize.x ;
+ toolrect.bottom = toolrect.top + toolSize.y ;
PicHandle icon = NULL ;
if ( bmap )
ControlHandle m_macToolHandle ;
+ SInt16 behaviour = kControlBehaviorOffsetContents ;
+ if ( tool->CanBeToggled() )
+ behaviour += kControlBehaviorToggles ;
+
if ( icon )
{
m_macToolHandle = UMANewControl( window , &toolrect , "\p" , true , 0 ,
- kControlBehaviorOffsetContents + kControlContentPictHandle , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
+ behaviour + kControlContentPictHandle , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
ControlButtonContentInfo info ;
info.contentType = kControlContentPictHandle ;
else
{
m_macToolHandle = UMANewControl( window , &toolrect , "\p" , true , 0 ,
- kControlBehaviorOffsetContents , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
+ behaviour , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
}
m_macToolHandles.Add( m_macToolHandle ) ;
UMASetControlFontStyle( m_macToolHandle , &controlstyle ) ;
UMAEmbedControl( m_macToolHandle , m_macControl ) ;
- x += (int)m_defaultWidth;
+ x += (int)toolSize.x;
noButtons ++;
}
else
{
m_macToolHandles.Add( NULL ) ;
- x += (int)m_defaultWidth / 4;
+ x += (int)toolSize.x / 4;
}
+ if ( toolbarrect.left + x + kwxMacToolBarLeftMargin > m_maxWidth)
+ m_maxWidth = toolbarrect.left + x + kwxMacToolBarLeftMargin;
+ if (toolbarrect.top + kwxMacToolBarTopMargin + toolSize.y > m_maxHeight)
+ m_maxHeight = toolbarrect.top + kwxMacToolBarTopMargin ;
+
node = node->Next();
}
+ if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
+ {
+ m_maxWidth = tw ; // +=toolSize.x;
+ m_maxHeight += toolSize.y;
+ m_maxHeight += m_yMargin;
+ }
+ else
+ {
+ m_maxHeight = th ;// += toolSize.y;
+ m_maxWidth += toolSize.x;
+ m_maxWidth += m_xMargin;
+ }
+
+ SetSize(m_maxWidth, m_maxHeight);
+
return TRUE;
}
m_defaultWidth = size.x; m_defaultHeight = size.y;
}
-wxSize wxToolBar::GetMaxSize() const
-{
- // TODO
- return wxSize(0, 0);
-}
-
// The button size is bigger than the bitmap size
wxSize wxToolBar::GetToolSize() const
{
{
if ( m_macToolHandles[index] == (void*) control )
{
- OnLeftClick( ( (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ) ->m_index , ( (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ) ->m_toggleState ) ;
+ OnLeftClick( ( (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ) ->m_index , ( (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ) ->IsToggled() ) ;
}
}
}
-void wxToolBar::EnableTool(int toolIndex, bool enable)
+void wxToolBar::SetRows(int nRows)
{
- wxNode *node = m_tools.Find((long)toolIndex);
- if (node)
+ if ( nRows == m_maxRows )
{
- wxToolBarTool *tool = (wxToolBarTool *)node->Data();
- tool->m_enabled = enable;
- // TODO enable button
+ // avoid resizing the frame uselessly
+ return;
}
+
+ m_maxRows = nRows;
}
-void wxToolBar::ToggleTool(int toolIndex, bool toggle)
+wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
{
- wxNode *node = m_tools.Find((long)toolIndex);
- if (node)
- {
- wxToolBarTool *tool = (wxToolBarTool *)node->Data();
- if (tool->m_isToggle)
- {
- tool->m_toggleState = toggle;
- // TODO: set toggle state
- }
- }
+ MacClientToRootWindow( &x , &y ) ;
+ Point pt = { x ,y } ;
+
+ int index = 0 ;
+ for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
+ {
+ if ( PtInRect( pt , &(**(ControlHandle)(m_macToolHandles[index])).contrlRect) )
+ {
+ return (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ;
+ }
+ }
+
+ return (wxToolBarToolBase *)NULL;
}
-void wxToolBar::ClearTools()
+void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
{
- // TODO
- wxToolBarBase::ClearTools();
+ wxToolBarTool *tool = (wxToolBarTool *)t;
+ ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
+ if ( UMAHasAppearance() )
+ {
+ if ( enable )
+ ::ActivateControl( control ) ;
+ else
+ ::DeactivateControl( control ) ;
+ }
+ else
+ {
+ if ( enable )
+ ::HiliteControl( control , 0 ) ;
+ else
+ ::HiliteControl( control , 255 ) ;
+ }
}
-// If pushedBitmap is NULL, a reversed version of bitmap is
-// created and used as the pushed/toggled image.
-// If toggle is TRUE, the button toggles between the two states.
-
-wxToolBarTool *wxToolBar::AddTool(int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,
- bool toggle, long xPos, long yPos, wxObject *clientData, const wxString& helpString1, const wxString& helpString2)
+void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
{
- wxToolBarTool *tool = new wxToolBarTool(index, bitmap, wxNullBitmap, toggle, xPos, yPos, helpString1, helpString2);
- tool->m_clientData = clientData;
-
- if (xPos > -1)
- tool->m_x = xPos;
- else
- tool->m_x = m_xMargin;
+ wxToolBarTool *tool = (wxToolBarTool *)t;
+
+ ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
+ ::SetControlValue( control , toggle ) ;
+}
- if (yPos > -1)
- tool->m_y = yPos;
- else
- tool->m_y = m_yMargin;
+bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
+ wxToolBarToolBase *tool)
+{
+ // nothing special to do here - we really create the toolbar buttons in
+ // Realize() later
+ tool->Attach(this);
- tool->SetSize(m_defaultWidth, m_defaultHeight);
+ return TRUE;
+}
- m_tools.Append((long)index, tool);
- return tool;
+void wxToolBar::DoSetToggle(wxToolBarToolBase *t, bool toggle)
+{
+ wxToolBarTool *tool = (wxToolBarTool *)t;
+ // TODO: set toggle state
}
+bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
+{
+ return TRUE ;
+}
#endif // wxUSE_TOOLBAR
projects / wxWidgets.git / blobdiff