X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee7908dbe96736f272d4855fdd88c138194d3a9a..005198fa7d8e244f9c9c28263c8eca5a9ced8e16:/src/univ/toolbar.cpp?ds=sidebyside diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp index 1d68c60857..74ff8b55e0 100644 --- a/src/univ/toolbar.cpp +++ b/src/univ/toolbar.cpp @@ -18,7 +18,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "univtoolbar.h" #endif @@ -38,6 +38,7 @@ #include "wx/univ/renderer.h" +#include "wx/frame.h" #include "wx/toolbar.h" #include "wx/image.h" #include "wx/log.h" @@ -71,6 +72,24 @@ public: // no position yet m_x = m_y = -1; + m_width = + m_height = 0; + + // not pressed yet + m_isInverted = FALSE; + + // mouse not here yet + m_underMouse = FALSE; + } + + wxToolBarTool(wxToolBar *tbar, wxControl *control) + : wxToolBarToolBase(tbar, control) + { + // no position yet + m_x = + m_y = -1; + m_width = + m_height = 0; // not pressed yet m_isInverted = FALSE; @@ -95,9 +114,11 @@ public: bool IsUnderMouse() { return m_underMouse; } public: - // the tool position (the size is known by the toolbar itself) - int m_x, - m_y; + // the tool position (for controls) + wxCoord m_x; + wxCoord m_y; + wxCoord m_width; + wxCoord m_height; private: // TRUE if the tool is pressed @@ -156,6 +177,8 @@ bool wxToolBar::Create(wxWindow *parent, wxToolBar::~wxToolBar() { + // Make sure the toolbar is removed from the parent. + SetSize(0,0); } void wxToolBar::SetMargins(int x, int y) @@ -188,7 +211,7 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const return NULL; } - for ( wxToolBarToolsList::Node *node = m_tools.GetFirst(); + for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); node; node = node->GetNext() ) { @@ -327,9 +350,7 @@ wxToolBarToolBase *wxToolBar::CreateTool(int id, wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) { - wxFAIL_MSG( wxT("Toolbar doesn't support controls yet (TODO)") ); - - return NULL; + return new wxToolBarTool(this, control); } // ---------------------------------------------------------------------------- @@ -355,13 +376,39 @@ wxRect wxToolBar::GetToolRect(wxToolBarToolBase *toolBase) const if ( IsVertical() ) { - rect.width = m_defaultWidth; - rect.height = tool->IsSeparator() ? m_widthSeparator : m_defaultHeight; + if (tool->IsButton()) + { + rect.width = m_defaultWidth; + rect.height = m_defaultHeight; + } + else if (tool->IsSeparator()) + { + rect.width = m_defaultWidth; + rect.height = m_widthSeparator; + } + else // control + { + rect.width = tool->m_width; + rect.height = tool->m_height; + } } else // horizontal { - rect.width = tool->IsSeparator() ? m_widthSeparator : m_defaultWidth; - rect.height = m_defaultHeight; + if (tool->IsButton()) + { + rect.width = m_defaultWidth; + rect.height = m_defaultHeight; + } + else if (tool->IsSeparator()) + { + rect.width = m_widthSeparator; + rect.height = m_defaultHeight; + } + else // control + { + rect.width = tool->m_width; + rect.height = tool->m_height; + } } rect.width += 2*m_xMargin; @@ -397,7 +444,7 @@ void wxToolBar::DoLayout() *pCur = IsVertical() ? &y : &x; // calculate the positions of all elements - for ( wxToolBarToolsList::Node *node = m_tools.GetFirst(); + for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); node; node = node->GetNext() ) { @@ -407,7 +454,25 @@ void wxToolBar::DoLayout() tool->m_y = y; // TODO ugly number fiddling - *pCur += ( tool->IsSeparator() ? m_widthSeparator : (widthTool+2) ) + margin; + if (tool->IsButton()) + { + *pCur += widthTool; + } + else if (tool->IsSeparator()) + { + *pCur += m_widthSeparator; + } + else if (!IsVertical()) // horizontal control + { + wxControl *control = tool->GetControl(); + wxSize size = control->GetSize(); + tool->m_y += (m_defaultHeight - size.y)/2; + tool->m_width = size.x; + tool->m_height = size.y; + + *pCur += tool->m_width; + } + *pCur += margin; } // calculate the total toolbar size @@ -423,6 +488,39 @@ wxSize wxToolBar::DoGetBestClientSize() const return wxSize(m_maxWidth, m_maxHeight); } +void wxToolBar::DoSetSize(int x, int y, int width, int height, int sizeFlags) +{ + int old_width, old_height; + GetSize(&old_width, &old_height); + + wxToolBarBase::DoSetSize(x, y, width, height, sizeFlags); + + // Correct width and height if needed. + if ( width == -1 || height == -1 ) + { + int tmp_width, tmp_height; + GetSize(&tmp_width, &tmp_height); + + if ( width == -1 ) + width = tmp_width; + if ( height == -1 ) + height = tmp_height; + } + + // We must refresh the frame size when the toolbar changes size + // otherwise the toolbar can be shown incorrectly + if ( old_width != width || old_height != height ) + { + // But before we send the size event check it + // we have a frame that is not being deleted. + wxFrame *frame = wxDynamicCast(GetParent(), wxFrame); + if ( frame && !frame->IsBeingDeleted() ) + { + frame->SendSizeEvent(); + } + } +} + // ---------------------------------------------------------------------------- // wxToolBar drawing // ---------------------------------------------------------------------------- @@ -470,7 +568,7 @@ void wxToolBar::DoDraw(wxControlRenderer *renderer) GetRectLimits(rectUpdate, &start, &end); // and redraw all the tools intersecting it - for ( wxToolBarToolsList::Node *node = m_tools.GetFirst(); + for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); node; node = node->GetNext() ) { @@ -526,7 +624,15 @@ void wxToolBar::DoDraw(wxControlRenderer *renderer) } //else: leave both the label and the bitmap invalid to draw a separator - rend->DrawToolBarButton(dc, label, bitmap, rectTool, flags); + if ( !tool->IsControl() ) + { + rend->DrawToolBarButton(dc, label, bitmap, rectTool, flags, tool->GetStyle()); + } + else // control + { + wxControl *control = tool->GetControl(); + control->Move(tool->m_x, tool->m_y); + } } } @@ -539,6 +645,8 @@ bool wxToolBar::PerformAction(const wxControlAction& action, const wxString& strArg) { wxToolBarTool *tool = (wxToolBarTool*) FindById(numArg); + if (!tool) + return false; if ( action == wxACTION_TOOLBAR_TOGGLE ) { @@ -663,10 +771,13 @@ bool wxStdToolbarInputHandler::HandleMouse(wxInputConsumer *consumer, m_winCapture = NULL; } - if ( tool == m_toolCapture ) - consumer->PerformAction( wxACTION_BUTTON_TOGGLE, m_toolCapture->GetId() ); - else - consumer->PerformAction( wxACTION_TOOLBAR_LEAVE, m_toolCapture->GetId() ); + if (m_toolCapture) + { + if ( tool == m_toolCapture ) + consumer->PerformAction( wxACTION_BUTTON_TOGGLE, m_toolCapture->GetId() ); + else + consumer->PerformAction( wxACTION_TOOLBAR_LEAVE, m_toolCapture->GetId() ); + } m_toolCapture = NULL; @@ -740,9 +851,9 @@ bool wxStdToolbarInputHandler::HandleMouseMove(wxInputConsumer *consumer, } bool wxStdToolbarInputHandler::HandleFocus(wxInputConsumer *consumer, - const wxFocusEvent& event) + const wxFocusEvent& WXUNUSED(event)) { - if (m_toolCapture) + if ( m_toolCapture ) { // We shouldn't be left with a highlighted button consumer->PerformAction( wxACTION_TOOLBAR_LEAVE, m_toolCapture->GetId() );