X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/74c80fe40be90a5a604b9de8731fcedf910e7d7d..08670ea85abf4b4946a9ce64971b591d7b1ee30b:/src/common/tbarbase.cpp?ds=sidebyside diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp index 8d07da7930..ced3746df2 100644 --- a/src/common/tbarbase.cpp +++ b/src/common/tbarbase.cpp @@ -38,6 +38,8 @@ #include "wx/menu.h" #endif +extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[] = "toolbar"; + // ---------------------------------------------------------------------------- // wxWidgets macros // ---------------------------------------------------------------------------- @@ -61,7 +63,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBarToolBase, wxObject) wxToolBarToolBase::~wxToolBarToolBase() { +#if wxUSE_MENUS delete m_dropdownMenu; +#endif + if ( IsControl() ) GetControl()->Destroy(); } @@ -79,7 +84,7 @@ bool wxToolBarToolBase::Enable(bool enable) bool wxToolBarToolBase::Toggle(bool toggle) { - wxASSERT_MSG( CanBeToggled(), _T("can't toggle this tool") ); + wxASSERT_MSG( CanBeToggled(), wxT("can't toggle this tool") ); if ( m_toggled == toggle ) return false; @@ -121,11 +126,13 @@ bool wxToolBarToolBase::SetLongHelp(const wxString& help) } +#if wxUSE_MENUS void wxToolBarToolBase::SetDropdownMenu(wxMenu* menu) { delete m_dropdownMenu; m_dropdownMenu = menu; } +#endif // ---------------------------------------------------------------------------- @@ -151,7 +158,7 @@ void wxToolBarBase::FixupStyle() } } -wxToolBarToolBase *wxToolBarBase::DoAddTool(int id, +wxToolBarToolBase *wxToolBarBase::DoAddTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled, @@ -163,12 +170,12 @@ wxToolBarToolBase *wxToolBarBase::DoAddTool(int id, wxCoord WXUNUSED(yPos)) { InvalidateBestSize(); - return InsertTool(GetToolsCount(), id, label, bitmap, bmpDisabled, + return InsertTool(GetToolsCount(), toolid, label, bitmap, bmpDisabled, kind, shortHelp, longHelp, clientData); } wxToolBarToolBase *wxToolBarBase::InsertTool(size_t pos, - int id, + int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled, @@ -177,20 +184,11 @@ wxToolBarToolBase *wxToolBarBase::InsertTool(size_t pos, const wxString& longHelp, wxObject *clientData) { - wxCHECK_MSG( pos <= GetToolsCount(), (wxToolBarToolBase *)NULL, - _T("invalid position in wxToolBar::InsertTool()") ); - - wxToolBarToolBase *tool = CreateTool(id, label, bitmap, bmpDisabled, kind, - clientData, shortHelp, longHelp); + wxCHECK_MSG( pos <= GetToolsCount(), NULL, + wxT("invalid position in wxToolBar::InsertTool()") ); - if ( !InsertTool(pos, tool) ) - { - delete tool; - - return NULL; - } - - return tool; + return DoInsertNewTool(pos, CreateTool(toolid, label, bitmap, bmpDisabled, kind, + clientData, shortHelp, longHelp)); } wxToolBarToolBase *wxToolBarBase::AddTool(wxToolBarToolBase *tool) @@ -201,8 +199,8 @@ wxToolBarToolBase *wxToolBarBase::AddTool(wxToolBarToolBase *tool) wxToolBarToolBase * wxToolBarBase::InsertTool(size_t pos, wxToolBarToolBase *tool) { - wxCHECK_MSG( pos <= GetToolsCount(), (wxToolBarToolBase *)NULL, - _T("invalid position in wxToolBar::InsertTool()") ); + wxCHECK_MSG( pos <= GetToolsCount(), NULL, + wxT("invalid position in wxToolBar::InsertTool()") ); if ( !tool || !DoInsertTool(pos, tool) ) { @@ -226,28 +224,16 @@ wxToolBarBase::InsertControl(size_t pos, wxControl *control, const wxString& label) { - wxCHECK_MSG( control, (wxToolBarToolBase *)NULL, - _T("toolbar: can't insert NULL control") ); + wxCHECK_MSG( control, NULL, + wxT("toolbar: can't insert NULL control") ); - wxCHECK_MSG( control->GetParent() == this, (wxToolBarToolBase *)NULL, - _T("control must have toolbar as parent") ); + wxCHECK_MSG( control->GetParent() == this, NULL, + wxT("control must have toolbar as parent") ); - wxCHECK_MSG( pos <= GetToolsCount(), (wxToolBarToolBase *)NULL, - _T("invalid position in wxToolBar::InsertControl()") ); - - wxToolBarToolBase *tool = CreateTool(control, label); - - if ( !InsertTool(pos, tool) ) - { - delete tool; - - return NULL; - } - - return tool; + return DoInsertNewTool(pos, CreateTool(control, label)); } -wxControl *wxToolBarBase::FindControl( int id ) +wxControl *wxToolBarBase::FindControl( int toolid ) { for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); node; @@ -260,9 +246,9 @@ wxControl *wxToolBarBase::FindControl( int id ) if ( !control ) { - wxFAIL_MSG( _T("NULL control in toolbar?") ); + wxFAIL_MSG( wxT("NULL control in toolbar?") ); } - else if ( control->GetId() == id ) + else if ( control->GetId() == toolid ) { // found return control; @@ -280,34 +266,38 @@ wxToolBarToolBase *wxToolBarBase::AddSeparator() wxToolBarToolBase *wxToolBarBase::InsertSeparator(size_t pos) { - wxCHECK_MSG( pos <= GetToolsCount(), (wxToolBarToolBase *)NULL, - _T("invalid position in wxToolBar::InsertSeparator()") ); + return DoInsertNewTool(pos, CreateSeparator()); +} - wxToolBarToolBase *tool = CreateTool(wxID_SEPARATOR, - wxEmptyString, - wxNullBitmap, wxNullBitmap, - wxITEM_SEPARATOR, (wxObject *)NULL, - wxEmptyString, wxEmptyString); +wxToolBarToolBase *wxToolBarBase::AddStretchableSpace() +{ + return InsertStretchableSpace(GetToolsCount()); +} - if ( !tool || !DoInsertTool(pos, tool) ) +wxToolBarToolBase *wxToolBarBase::InsertStretchableSpace(size_t pos) +{ + wxToolBarToolBase * const tool = CreateSeparator(); + if ( tool ) { - delete tool; - - return NULL; + // this is a hack but we know that all the current implementations + // don't really use the tool when it's created, they will do it + // InsertTool() at earliest and maybe even in Realize() much later + // + // so we can create the tool as a plain separator and mark it as being + // a stretchable space later + tool->MakeStretchable(); } - m_tools.Insert(pos, tool); - - return tool; + return DoInsertNewTool(pos, tool); } -wxToolBarToolBase *wxToolBarBase::RemoveTool(int id) +wxToolBarToolBase *wxToolBarBase::RemoveTool(int toolid) { size_t pos = 0; wxToolBarToolsList::compatibility_iterator node; for ( node = m_tools.GetFirst(); node; node = node->GetNext() ) { - if ( node->GetData()->GetId() == id ) + if ( node->GetData()->GetId() == toolid ) break; pos++; @@ -336,7 +326,7 @@ wxToolBarToolBase *wxToolBarBase::RemoveTool(int id) bool wxToolBarBase::DeleteToolByPos(size_t pos) { wxCHECK_MSG( pos < GetToolsCount(), false, - _T("invalid position in wxToolBar::DeleteToolByPos()") ); + wxT("invalid position in wxToolBar::DeleteToolByPos()") ); wxToolBarToolsList::compatibility_iterator node = m_tools.Item(pos); @@ -351,13 +341,13 @@ bool wxToolBarBase::DeleteToolByPos(size_t pos) return true; } -bool wxToolBarBase::DeleteTool(int id) +bool wxToolBarBase::DeleteTool(int toolid) { size_t pos = 0; wxToolBarToolsList::compatibility_iterator node; for ( node = m_tools.GetFirst(); node; node = node->GetNext() ) { - if ( node->GetData()->GetId() == id ) + if ( node->GetData()->GetId() == toolid ) break; pos++; @@ -374,16 +364,16 @@ bool wxToolBarBase::DeleteTool(int id) return true; } -wxToolBarToolBase *wxToolBarBase::FindById(int id) const +wxToolBarToolBase *wxToolBarBase::FindById(int toolid) const { - wxToolBarToolBase *tool = (wxToolBarToolBase *)NULL; + wxToolBarToolBase *tool = NULL; for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); node; node = node->GetNext() ) { tool = node->GetData(); - if ( tool->GetId() == id ) + if ( tool->GetId() == toolid ) { // found break; @@ -397,13 +387,13 @@ wxToolBarToolBase *wxToolBarBase::FindById(int id) const void wxToolBarBase::UnToggleRadioGroup(wxToolBarToolBase *tool) { - wxCHECK_RET( tool, _T("NULL tool in wxToolBarTool::UnToggleRadioGroup") ); + wxCHECK_RET( tool, wxT("NULL tool in wxToolBarTool::UnToggleRadioGroup") ); if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO ) return; wxToolBarToolsList::compatibility_iterator node = m_tools.Find(tool); - wxCHECK_RET( node, _T("invalid tool in wxToolBarTool::UnToggleRadioGroup") ); + wxCHECK_RET( node, wxT("invalid tool in wxToolBarTool::UnToggleRadioGroup") ); wxToolBarToolsList::compatibility_iterator nodeNext = node->GetNext(); while ( nodeNext ) @@ -446,8 +436,34 @@ void wxToolBarBase::ClearTools() } } +void wxToolBarBase::AdjustToolBitmapSize() +{ + const wxSize sizeOrig(m_defaultWidth, m_defaultHeight); + + wxSize sizeActual(sizeOrig); + + for ( wxToolBarToolsList::const_iterator i = m_tools.begin(); + i != m_tools.end(); + ++i ) + { + const wxBitmap& bmp = (*i)->GetNormalBitmap(); + if ( bmp.IsOk() ) + sizeActual.IncTo(bmp.GetSize()); + } + + if ( sizeActual != sizeOrig ) + SetToolBitmapSize(sizeActual); +} + bool wxToolBarBase::Realize() { + // check if we have anything to do + if ( m_tools.empty() ) + return false; + + // make sure tool size is large enough for all bitmaps to fit in + AdjustToolBitmapSize(); + return true; } @@ -468,9 +484,9 @@ wxToolBarBase::~wxToolBarBase() // wxToolBarBase tools state // ---------------------------------------------------------------------------- -void wxToolBarBase::EnableTool(int id, bool enable) +void wxToolBarBase::EnableTool(int toolid, bool enable) { - wxToolBarToolBase *tool = FindById(id); + wxToolBarToolBase *tool = FindById(toolid); if ( tool ) { if ( tool->Enable(enable) ) @@ -480,9 +496,9 @@ void wxToolBarBase::EnableTool(int id, bool enable) } } -void wxToolBarBase::ToggleTool(int id, bool toggle) +void wxToolBarBase::ToggleTool(int toolid, bool toggle) { - wxToolBarToolBase *tool = FindById(id); + wxToolBarToolBase *tool = FindById(toolid); if ( tool && tool->CanBeToggled() ) { if ( tool->Toggle(toggle) ) @@ -493,9 +509,9 @@ void wxToolBarBase::ToggleTool(int id, bool toggle) } } -void wxToolBarBase::SetToggle(int id, bool toggle) +void wxToolBarBase::SetToggle(int toolid, bool toggle) { - wxToolBarToolBase *tool = FindById(id); + wxToolBarToolBase *tool = FindById(toolid); if ( tool ) { if ( tool->SetToggle(toggle) ) @@ -505,48 +521,48 @@ void wxToolBarBase::SetToggle(int id, bool toggle) } } -void wxToolBarBase::SetToolShortHelp(int id, const wxString& help) +void wxToolBarBase::SetToolShortHelp(int toolid, const wxString& help) { - wxToolBarToolBase *tool = FindById(id); + wxToolBarToolBase *tool = FindById(toolid); if ( tool ) { (void)tool->SetShortHelp(help); } } -void wxToolBarBase::SetToolLongHelp(int id, const wxString& help) +void wxToolBarBase::SetToolLongHelp(int toolid, const wxString& help) { - wxToolBarToolBase *tool = FindById(id); + wxToolBarToolBase *tool = FindById(toolid); if ( tool ) { (void)tool->SetLongHelp(help); } } -wxObject *wxToolBarBase::GetToolClientData(int id) const +wxObject *wxToolBarBase::GetToolClientData(int toolid) const { - wxToolBarToolBase *tool = FindById(id); + wxToolBarToolBase *tool = FindById(toolid); - return tool ? tool->GetClientData() : (wxObject *)NULL; + return tool ? tool->GetClientData() : NULL; } -void wxToolBarBase::SetToolClientData(int id, wxObject *clientData) +void wxToolBarBase::SetToolClientData(int toolid, wxObject *clientData) { - wxToolBarToolBase *tool = FindById(id); + wxToolBarToolBase *tool = FindById(toolid); - wxCHECK_RET( tool, _T("no such tool in wxToolBar::SetToolClientData") ); + wxCHECK_RET( tool, wxT("no such tool in wxToolBar::SetToolClientData") ); tool->SetClientData(clientData); } -int wxToolBarBase::GetToolPos(int id) const +int wxToolBarBase::GetToolPos(int toolid) const { size_t pos = 0; wxToolBarToolsList::compatibility_iterator node; for ( node = m_tools.GetFirst(); node; node = node->GetNext() ) { - if ( node->GetData()->GetId() == id ) + if ( node->GetData()->GetId() == toolid ) return pos; pos++; @@ -555,34 +571,34 @@ int wxToolBarBase::GetToolPos(int id) const return wxNOT_FOUND; } -bool wxToolBarBase::GetToolState(int id) const +bool wxToolBarBase::GetToolState(int toolid) const { - wxToolBarToolBase *tool = FindById(id); - wxCHECK_MSG( tool, false, _T("no such tool") ); + wxToolBarToolBase *tool = FindById(toolid); + wxCHECK_MSG( tool, false, wxT("no such tool") ); return tool->IsToggled(); } -bool wxToolBarBase::GetToolEnabled(int id) const +bool wxToolBarBase::GetToolEnabled(int toolid) const { - wxToolBarToolBase *tool = FindById(id); - wxCHECK_MSG( tool, false, _T("no such tool") ); + wxToolBarToolBase *tool = FindById(toolid); + wxCHECK_MSG( tool, false, wxT("no such tool") ); return tool->IsEnabled(); } -wxString wxToolBarBase::GetToolShortHelp(int id) const +wxString wxToolBarBase::GetToolShortHelp(int toolid) const { - wxToolBarToolBase *tool = FindById(id); - wxCHECK_MSG( tool, wxEmptyString, _T("no such tool") ); + wxToolBarToolBase *tool = FindById(toolid); + wxCHECK_MSG( tool, wxEmptyString, wxT("no such tool") ); return tool->GetShortHelp(); } -wxString wxToolBarBase::GetToolLongHelp(int id) const +wxString wxToolBarBase::GetToolLongHelp(int toolid) const { - wxToolBarToolBase *tool = FindById(id); - wxCHECK_MSG( tool, wxEmptyString, _T("no such tool") ); + wxToolBarToolBase *tool = FindById(toolid); + wxCHECK_MSG( tool, wxEmptyString, wxT("no such tool") ); return tool->GetLongHelp(); } @@ -613,9 +629,9 @@ bool wxToolBarBase::IsVertical() const // ---------------------------------------------------------------------------- // Only allow toggle if returns true -bool wxToolBarBase::OnLeftClick(int id, bool toggleDown) +bool wxToolBarBase::OnLeftClick(int toolid, bool toggleDown) { - wxCommandEvent event(wxEVT_COMMAND_TOOL_CLICKED, id); + wxCommandEvent event(wxEVT_COMMAND_TOOL_CLICKED, toolid); event.SetEventObject(this); // we use SetInt() to make wxCommandEvent::IsChecked() return toggleDown @@ -625,48 +641,48 @@ bool wxToolBarBase::OnLeftClick(int id, bool toggleDown) event.SetExtraLong((long)toggleDown); // Send events to this toolbar instead (and thence up the window hierarchy) - GetEventHandler()->ProcessEvent(event); + HandleWindowEvent(event); return true; } // Call when right button down. -void wxToolBarBase::OnRightClick(int id, +void wxToolBarBase::OnRightClick(int toolid, long WXUNUSED(x), long WXUNUSED(y)) { - wxCommandEvent event(wxEVT_COMMAND_TOOL_RCLICKED, id); + wxCommandEvent event(wxEVT_COMMAND_TOOL_RCLICKED, toolid); event.SetEventObject(this); - event.SetInt(id); + event.SetInt(toolid); GetEventHandler()->ProcessEvent(event); } // Called when the mouse cursor enters a tool bitmap (no button pressed). // Argument is wxID_ANY if mouse is exiting the toolbar. -// Note that for this event, the id of the window is used, +// Note that for this event, the toolid of the window is used, // and the integer parameter of wxCommandEvent is used to retrieve -// the tool id. -void wxToolBarBase::OnMouseEnter(int id) +// the tool toolid. +void wxToolBarBase::OnMouseEnter(int toolid) { wxCommandEvent event(wxEVT_COMMAND_TOOL_ENTER, GetId()); event.SetEventObject(this); - event.SetInt(id); + event.SetInt(toolid); wxFrame *frame = wxDynamicCast(GetParent(), wxFrame); if ( frame ) { wxString help; - if ( id != wxID_ANY ) + if ( toolid != wxID_ANY ) { - const wxToolBarToolBase * const tool = FindById(id); + const wxToolBarToolBase * const tool = FindById(toolid); if ( tool ) help = tool->GetLongHelp(); } // call DoGiveHelp() even if help string is empty to avoid showing the // help for the previously selected tool when another one is selected - frame->DoGiveHelp(help, id != wxID_ANY); + frame->DoGiveHelp(help, toolid != wxID_ANY); } (void)GetEventHandler()->ProcessEvent(event); @@ -701,17 +717,17 @@ void wxToolBarBase::UpdateWindowUI(long flags) if ( tool->IsSeparator() ) continue; - int id = tool->GetId(); + int toolid = tool->GetId(); - wxUpdateUIEvent event(id); + wxUpdateUIEvent event(toolid); event.SetEventObject(this); if ( evtHandler->ProcessEvent(event) ) { if ( event.GetSetEnabled() ) - EnableTool(id, event.GetEnabled()); + EnableTool(toolid, event.GetEnabled()); if ( event.GetSetChecked() ) - ToggleTool(id, event.GetChecked()); + ToggleTool(toolid, event.GetChecked()); #if 0 if ( event.GetSetText() ) // Set tooltip? @@ -720,18 +736,20 @@ void wxToolBarBase::UpdateWindowUI(long flags) } } +#if wxUSE_MENUS bool wxToolBarBase::SetDropdownMenu(int toolid, wxMenu* menu) { wxToolBarToolBase * const tool = FindById(toolid); - wxCHECK_MSG( tool, false, _T("invalid tool id") ); + wxCHECK_MSG( tool, false, wxT("invalid tool toolid") ); wxCHECK_MSG( tool->GetKind() == wxITEM_DROPDOWN, false, - _T("menu can be only associated with drop down tools") ); + wxT("menu can be only associated with drop down tools") ); tool->SetDropdownMenu(menu); return true; } +#endif #if WXWIN_COMPATIBILITY_2_8 @@ -739,7 +757,7 @@ bool wxCreateGreyedImage(const wxImage& in, wxImage& out) { #if wxUSE_IMAGE out = in.ConvertToGreyscale(); - if ( out.Ok() ) + if ( out.IsOk() ) return true; #endif // wxUSE_IMAGE return false;