X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6670f56440ae9209b3e2e51e06acf3bc5aaf1905..66ddd8d2f2e58f51a0ddecf2581766b6f932254a:/src/os2/toolbar.cpp?ds=sidebyside diff --git a/src/os2/toolbar.cpp b/src/os2/toolbar.cpp index ea8d5f8480..edc4752374 100644 --- a/src/os2/toolbar.cpp +++ b/src/os2/toolbar.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: toolbar.cpp +// Name: src/os2/toolbar.cpp // Purpose: wxToolBar // Author: David Webster // Modified by: @@ -14,6 +14,8 @@ #if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE +#include "wx/toolbar.h" + #ifndef WX_PRECOMP #include "wx/settings.h" #include "wx/window.h" @@ -24,9 +26,8 @@ #endif #include "wx/tooltip.h" -#include "wx/toolbar.h" -bool wxToolBar::m_bInitialized = FALSE; +bool wxToolBar::m_bInitialized = false; // ---------------------------------------------------------------------------- // private classes @@ -59,8 +60,10 @@ public: inline wxToolBarTool( wxToolBar* pTbar ,wxControl* pControl + ,const wxString& label ) : wxToolBarToolBase( pTbar ,pControl + ,label ) { } @@ -127,10 +130,12 @@ wxToolBarToolBase* wxToolBar::CreateTool( wxToolBarToolBase *wxToolBar::CreateTool( wxControl* pControl +, const wxString& label ) { return new wxToolBarTool( this ,pControl + ,label ); } // end of wxToolBarSimple::CreateTool @@ -275,12 +280,10 @@ wxToolBarToolBase* wxToolBar::InsertTool( return pTool; } // end of wxToolBar::InsertTool -bool wxToolBar::DoInsertTool( - size_t WXUNUSED(nPos) -, wxToolBarToolBase* pToolBase -) +bool wxToolBar::DoInsertTool( size_t WXUNUSED(nPos), + wxToolBarToolBase* pToolBase ) { - wxToolBarTool* pTool = (wxToolBarTool *)pToolBase; + wxToolBarTool* pTool = (wxToolBarTool *)pToolBase; pTool->m_vX = m_vXPos; if (pTool->m_vX == -1) @@ -303,27 +306,23 @@ bool wxToolBar::DoInsertTool( if ((pTool->m_vY + pTool->GetNormalBitmap().GetHeight() + m_yMargin) > m_vMaxHeight) m_vMaxHeight = (wxCoord)((pTool->m_vY + pTool->GetHeight() + m_yMargin)); } - return TRUE; + return true; } // end of wxToolBar::DoInsertTool -bool wxToolBar::DoDeleteTool( - size_t WXUNUSED(nPos) -, wxToolBarToolBase* pTool -) +bool wxToolBar::DoDeleteTool( size_t WXUNUSED(nPos), + wxToolBarToolBase* pTool ) { pTool->Detach(); Refresh(); - return TRUE; + return true; } // end of wxToolBar::DoDeleteTool -bool wxToolBar::Create( - wxWindow* pParent -, wxWindowID vId -, const wxPoint& rPos -, const wxSize& rSize -, long lStyle -, const wxString& rsName -) +bool wxToolBar::Create( wxWindow* pParent, + wxWindowID vId, + const wxPoint& rPos, + const wxSize& rSize, + long lStyle, + const wxString& rsName ) { if ( !wxWindow::Create( pParent ,vId @@ -332,13 +331,13 @@ bool wxToolBar::Create( ,lStyle ,rsName )) - return FALSE; + return false; // Set it to grey (or other 3D face colour) SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR)); SetFont(*wxSMALL_FONT); - if (GetWindowStyleFlag() & wxTB_VERTICAL) + if (GetWindowStyleFlag() & (wxTB_LEFT | wxTB_RIGHT)) { m_vLastX = 7; m_vLastY = 3; @@ -380,7 +379,7 @@ bool wxToolBar::Create( int nWidth = rSize.x; int nHeight = rSize.y; - if (lStyle & wxTB_HORIZONTAL) + if (lStyle & (wxTB_TOP | wxTB_BOTTOM)) { if (nWidth <= 0) { @@ -418,7 +417,7 @@ bool wxToolBar::Create( ,nWidth ,nHeight ); - return TRUE; + return true; } // end of wxToolBar::Create wxToolBar::~wxToolBar() @@ -504,7 +503,7 @@ bool wxToolBar::Realize() if (pTool->IsSeparator()) { - if (GetWindowStyleFlag() & wxTB_HORIZONTAL) + if (GetWindowStyleFlag() & (wxTB_TOP | wxTB_BOTTOM)) { pTool->m_vX = m_vLastX + nSeparatorSize; pTool->m_vHeight = m_defaultHeight + m_vTextY; @@ -525,7 +524,7 @@ bool wxToolBar::Realize() } else if (pTool->IsButton()) { - if (GetWindowStyleFlag() & wxTB_HORIZONTAL) + if (GetWindowStyleFlag() & (wxTB_TOP | wxTB_BOTTOM)) { if (m_nCurrentRowsOrColumns >= m_maxCols) { @@ -570,15 +569,15 @@ bool wxToolBar::Realize() node = node->GetNext(); } - if ( GetWindowStyleFlag() & wxTB_HORIZONTAL ) + if (GetWindowStyleFlag() & (wxTB_TOP | wxTB_BOTTOM)) m_maxWidth += nMaxToolWidth; else m_maxHeight += nMaxToolHeight; m_maxWidth += m_xMargin; m_maxHeight += m_yMargin; - m_bInitialized = TRUE; - return TRUE; + m_bInitialized = true; + return true; } // end of wxToolBar::Realize // ---------------------------------------------------------------------------- @@ -623,7 +622,7 @@ void wxToolBar::OnPaint ( vDc.SetPen(vDarkGreyPen); if (HasFlag(wxTB_TEXT)) { - if (HasFlag(wxTB_HORIZONTAL)) + if (HasFlag(wxTB_TOP) || HasFlag(wxTB_BOTTOM)) { nX = pTool->m_vX; nY = pTool->m_vY - (m_vTextY - 6); @@ -640,7 +639,7 @@ void wxToolBar::OnPaint ( { nX = pTool->m_vX; nY = pTool->m_vY; - if (HasFlag(wxTB_HORIZONTAL)) + if (HasFlag(wxTB_TOP) || HasFlag(wxTB_BOTTOM)) nHeight = pTool->GetHeight() - 2; else { @@ -716,9 +715,7 @@ void wxToolBar::OnMouseEvent( pTool = (wxToolBarTool *)FindById(m_nCurrentTool); if (pTool && !pTool->IsToggled()) { - RaiseTool( pTool - ,FALSE - ); + RaiseTool( pTool, FALSE ); } m_nCurrentTool = -1; OnMouseEnter(-1); @@ -745,9 +742,7 @@ void wxToolBar::OnMouseEvent( wxToolBarTool* pOldTool = (wxToolBarTool*)FindById(m_nCurrentTool); if (pOldTool && !pTool->IsToggled()) - RaiseTool( pOldTool - ,FALSE - ); + RaiseTool( pOldTool, FALSE ); m_nCurrentTool = pTool->GetId(); OnMouseEnter(m_nCurrentTool); if (!pTool->GetShortHelp().empty()) @@ -810,27 +805,20 @@ void wxToolBar::OnMouseEvent( // drawing // ---------------------------------------------------------------------------- -void wxToolBar::DrawTool( - wxToolBarToolBase* pTool -) +void wxToolBar::DrawTool( wxToolBarToolBase* pTool ) { - wxClientDC vDc(this); + wxClientDC vDc(this); - DrawTool( vDc - ,pTool - ); + DrawTool( vDc, pTool ); } // end of wxToolBar::DrawTool -void wxToolBar::DrawTool( - wxDC& rDc -, wxToolBarToolBase* pToolBase -) +void wxToolBar::DrawTool( wxDC& rDc, wxToolBarToolBase* pToolBase ) { wxToolBarTool* pTool = (wxToolBarTool *)pToolBase; wxColour gray85( 85,85,85 ); wxPen vDarkGreyPen( gray85, 1, wxSOLID ); wxBitmap vBitmap = pTool->GetNormalBitmap(); - bool bUseMask = FALSE; + bool bUseMask = false; wxMask* pMask = NULL; PrepareDC(rDc); @@ -839,7 +827,7 @@ void wxToolBar::DrawTool( return; if ((pMask = vBitmap.GetMask()) != NULL) if (pMask->GetMaskBitmap() != NULLHANDLE) - bUseMask = TRUE; + bUseMask = true; if (!pTool->IsToggled()) { @@ -889,7 +877,7 @@ void wxToolBar::DrawTool( GetSize(&vX, &vY); rDc.DrawText( pTool->GetLabel() ,vLeft - ,vY - (m_vTextY - 2) + ,vY - m_vTextY - 1 ); } else // normal tools @@ -897,7 +885,7 @@ void wxToolBar::DrawTool( vLeft += (wxCoord)((m_vTextX - vX)/2); rDc.DrawText( pTool->GetLabel() ,vLeft - ,pTool->m_vY + m_vTextY + 4 // a bit of margin + ,pTool->m_vY + m_vTextY - 1 // a bit of margin ); } } @@ -931,7 +919,7 @@ void wxToolBar::DrawTool( vLeft += (wxCoord)((m_vTextX - vX)/2); rDc.DrawText( pTool->GetLabel() ,vLeft - ,pTool->m_vY + m_vTextY + 4 // a bit of margin + ,pTool->m_vY + m_vTextY - 1 // a bit of margin ); } } @@ -1179,21 +1167,17 @@ void wxToolBar::RaiseTool ( wxToolBarToolBase* pToolBase, } } // end of wxToolBar::RaiseTool -void wxToolBar::OnTimer ( - wxTimerEvent& rEvent -) +void wxToolBar::OnTimer ( wxTimerEvent& rEvent ) { - if (rEvent.GetId() == m_vToolTimer.GetTimerId()) + if (rEvent.GetId() == m_vToolTimer.GetId()) { - wxPoint vPos( m_vXMouse - ,m_vYMouse - ); + wxPoint vPos( m_vXMouse, m_vYMouse ); m_pToolTip->DisplayToolTipWindow(vPos); m_vToolTimer.Stop(); m_vToolExpTimer.Start(4000L, TRUE); } - else if (rEvent.GetId() == m_vToolExpTimer.GetTimerId()) + else if (rEvent.GetId() == m_vToolExpTimer.GetId()) { m_pToolTip->HideToolTipWindow(); GetParent()->Refresh();