X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cfb7687556620cc0a558c9dab3f582de31369e67..6842d18650b487249b4ae29d0d7e17231b24cde8:/src/common/tbarbase.cpp diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp index 218ecbea4f..98eed8bbd5 100644 --- a/src/common/tbarbase.cpp +++ b/src/common/tbarbase.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -24,6 +24,8 @@ #include "wx/wx.h" #endif +#include "wx/frame.h" + // For ::UpdateWindow #ifdef __WXMSW__ #include @@ -53,7 +55,7 @@ wxToolBarTool::wxToolBarTool(wxToolBar *owner, int theIndex, const wxBitmap& theBitmap1, const wxBitmap& theBitmap2, bool toggle, wxObject *clientData, const wxString& helpS1, const wxString& helpS2, - GtkWidget *item ) + GtkWidget *pixmap ) #else wxToolBarTool::wxToolBarTool(int theIndex, const wxBitmap& theBitmap1, const wxBitmap& theBitmap2, bool toggle, @@ -63,7 +65,8 @@ wxToolBarTool::wxToolBarTool(int theIndex, m_toolStyle = wxTOOL_STYLE_BUTTON; #ifdef __WXGTK__ m_owner = owner; - m_item = item; + m_pixmap = pixmap; + m_item = (GtkWidget*) NULL; m_clientData = clientData; m_x = 0; m_y = 0; @@ -89,6 +92,13 @@ wxToolBarTool::wxToolBarTool(int theIndex, m_longHelpString = helpS2; } +wxToolBarTool::wxToolBarTool(wxControl *control) +{ + m_toolStyle = wxTOOL_STYLE_CONTROL; + m_control = control; + m_index = control->GetId(); +} + wxToolBarTool::~wxToolBarTool() { /* @@ -147,6 +157,7 @@ bool wxToolBarBase::OnLeftClick(int toolIndex, bool toggleDown) event.SetEventObject(this); event.SetExtraLong((long) toggleDown); + // Send events to this toolbar instead (and thence up the window hierarchy) GetEventHandler()->ProcessEvent(event); return TRUE; @@ -182,7 +193,7 @@ void wxToolBarBase::OnMouseEnter ( int toolIndex ) // created and used as the pushed/toggled image. // If toggle is TRUE, the button toggles between the two states. wxToolBarTool *wxToolBarBase::AddTool(int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap, - bool toggle, long xPos, long yPos, wxObject *clientData, + bool toggle, wxCoord xPos, wxCoord yPos, wxObject *clientData, const wxString& helpString1, const wxString& helpString2) { #ifdef __WXGTK__ @@ -217,6 +228,7 @@ wxToolBarTool *wxToolBarBase::AddTool(int index, const wxBitmap& bitmap, const w void wxToolBarBase::AddSeparator () { wxToolBarTool *tool = new wxToolBarTool; + tool->m_index = -1; tool->m_toolStyle = wxTOOL_STYLE_SEPARATOR; m_tools.Append(-1, tool); } @@ -394,7 +406,7 @@ void wxToolBarBase::Command(wxCommandEvent& WXUNUSED(event)) { } -void wxToolBarBase::Layout() +void wxToolBarBase::LayoutTools() { } @@ -720,7 +732,13 @@ void wxToolBarBase::ViewStart (int *x, int *y) const *y = m_yScrollPosition; } -void wxToolBarBase::OnIdle(wxIdleEvent& event) +void wxToolBarBase::OnIdle(wxIdleEvent& +#ifdef __WXGTK__ + WXUNUSED(event) +#else + event +#endif + ) { #ifndef __WXGTK__ wxWindow::OnIdle(event); @@ -732,6 +750,8 @@ void wxToolBarBase::OnIdle(wxIdleEvent& event) // Do the toolbar button updates (check for EVT_UPDATE_UI handlers) void wxToolBarBase::DoToolbarUpdates() { + wxEvtHandler* evtHandler = GetEventHandler() ; + wxNode* node = GetTools().First(); while (node) { @@ -740,7 +760,7 @@ void wxToolBarBase::DoToolbarUpdates() wxUpdateUIEvent event(tool->m_index); event.SetEventObject(this); - if (GetEventHandler()->ProcessEvent(event)) + if (evtHandler->ProcessEvent(event)) { if (event.GetSetEnabled()) EnableTool(tool->m_index, event.GetEnabled()); @@ -756,12 +776,4 @@ void wxToolBarBase::DoToolbarUpdates() } } -#ifdef __WXMSW__ -// Circumvent wxControl::MSWOnMouseMove which doesn't set the cursor. -void wxToolBarBase::MSWOnMouseMove(int x, int y, WXUINT flags) -{ - wxWindow::MSWOnMouseMove(x, y, flags); -} -#endif - #endif