/////////////////////////////////////////////////////////////////////////////
-// Name: toolbar.cpp
+// Name: src/os2/toolbar.cpp
// Purpose: wxToolBar
// Author: David Webster
// Modified by:
#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE
+#include "wx/toolbar.h"
+
#ifndef WX_PRECOMP
#include "wx/settings.h"
#include "wx/window.h"
+ #include "wx/frame.h"
+ #include "wx/app.h"
#include "wx/dcclient.h"
#include "wx/dcmemory.h"
#endif
-#include "wx/toolbar.h"
-
-bool wxToolBar::m_bInitialized = FALSE;
-
-// ---------------------------------------------------------------------------
-// Helper for taking a regular bitmap and giving it a disabled look
-// ---------------------------------------------------------------------------
-wxBitmap wxDisableBitmap(
- const wxBitmap& rBmp
-, long lColor
-)
-{
- wxMask* pMask = rBmp.GetMask();
-
- if (!pMask)
- return(wxNullBitmap);
-
- DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
- SIZEL vSize = {0, 0};
- HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
- HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC);
- BITMAPINFOHEADER2 vHeader;
- BITMAPINFO2 vInfo;
- ERRORID vError;
- wxString sError;
- HBITMAP hBitmap = (HBITMAP)rBmp.GetHBITMAP();
- HBITMAP hOldBitmap = NULLHANDLE;
- HBITMAP hOldMask = NULLHANDLE;
- HBITMAP hMask = (HBITMAP)rBmp.GetMask()->GetMaskBitmap();
- unsigned char* pucBits; // buffer that will contain the bitmap data
- unsigned char* pucData; // pointer to use to traverse bitmap data
- unsigned char* pucBitsMask; // buffer that will contain the mask data
- unsigned char* pucDataMask; // pointer to use to traverse mask data
- LONG lScans = 0L;
- LONG lScansSet = 0L;
- bool bpp16 = (wxDisplayDepth() == 16);
-
- memset(&vHeader, '\0', 16);
- vHeader.cbFix = 16;
-
- memset(&vInfo, '\0', 16);
- vInfo.cbFix = 16;
- vInfo.cx = (ULONG)rBmp.GetWidth();
- vInfo.cy = (ULONG)rBmp.GetHeight();
- vInfo.cPlanes = 1;
- vInfo.cBitCount = 24; // Set to desired count going in
-
- //
- // Create the buffers for data....all wxBitmaps are 24 bit internally
- //
- int nBytesPerLine = rBmp.GetWidth() * 3;
- int nSizeDWORD = sizeof(DWORD);
- int nLineBoundary = nBytesPerLine % nSizeDWORD;
- int nPadding = 0;
- int i;
- int j;
-
- //
- // Bitmap must be ina double-word alligned address so we may
- // have some padding to worry about
- //
- if (nLineBoundary > 0)
- {
- nPadding = nSizeDWORD - nLineBoundary;
- nBytesPerLine += nPadding;
- }
- pucBits = (unsigned char *)malloc(nBytesPerLine * rBmp.GetHeight());
- memset(pucBits, '\0', (nBytesPerLine * rBmp.GetHeight()));
- pucBitsMask = (unsigned char *)malloc(nBytesPerLine * rBmp.GetHeight());
- memset(pucBitsMask, '\0', (nBytesPerLine * rBmp.GetHeight()));
-
- //
- // Extract the bitmap and mask data
- //
- if ((hOldBitmap = ::GpiSetBitmap(hPS, hBitmap)) == HBM_ERROR)
- {
- vError = ::WinGetLastError(vHabmain);
- sError = wxPMErrorToStr(vError);
- }
- ::GpiQueryBitmapInfoHeader(hBitmap, &vHeader);
- vInfo.cBitCount = 24;
- if ((lScans = ::GpiQueryBitmapBits( hPS
- ,0L
- ,(LONG)rBmp.GetHeight()
- ,(PBYTE)pucBits
- ,&vInfo
- )) == GPI_ALTERROR)
- {
- vError = ::WinGetLastError(vHabmain);
- sError = wxPMErrorToStr(vError);
- }
- if ((hOldMask = ::GpiSetBitmap(hPS, hMask)) == HBM_ERROR)
- {
- vError = ::WinGetLastError(vHabmain);
- sError = wxPMErrorToStr(vError);
- }
- ::GpiQueryBitmapInfoHeader(hMask, &vHeader);
- vInfo.cBitCount = 24;
- if ((lScans = ::GpiQueryBitmapBits( hPS
- ,0L
- ,(LONG)rBmp.GetHeight()
- ,(PBYTE)pucBitsMask
- ,&vInfo
- )) == GPI_ALTERROR)
- {
- vError = ::WinGetLastError(vHabmain);
- sError = wxPMErrorToStr(vError);
- }
- if (( hMask = ::GpiSetBitmap(hPS, hOldMask)) == HBM_ERROR)
- {
- vError = ::WinGetLastError(vHabmain);
- sError = wxPMErrorToStr(vError);
- }
- pucData = pucBits;
- pucDataMask = pucBitsMask;
-
- //
- // Get the mask value
- //
- for (i = 0; i < rBmp.GetHeight(); i++)
- {
- for (j = 0; j < rBmp.GetWidth(); j++)
- {
- // Byte 1
- if (bpp16 && *pucDataMask == 0xF8) // 16 bit display gobblygook
- {
- *pucData = 0x7F;
- pucData++;
- }
- else if (*pucDataMask == 0xFF) // set to grey
- {
- *pucData = 0x7F;
- pucData++;
- }
- else
- {
- *pucData = ((unsigned char)(lColor >> 16));
- pucData++;
- }
-
- // Byte 2
- if (bpp16 && *(pucDataMask + 1) == 0xFC) // 16 bit display gobblygook
- {
- *pucData = 0x7F;
- pucData++;
- }
- else if (*(pucDataMask + 1) == 0xFF) // set to grey
- {
- *pucData = 0x7F;
- pucData++;
- }
- else
- {
- *pucData = ((unsigned char)(lColor >> 8));
- pucData++;
- }
-
- // Byte 3
- if (bpp16 && *(pucDataMask + 2) == 0xF8) // 16 bit display gobblygook
- {
- *pucData = 0x7F;
- pucData++;
- }
- else if (*(pucDataMask + 2) == 0xFF) // set to grey
- {
- *pucData = 0x7F;
- pucData++;
- }
- else
- {
- *pucData = ((unsigned char)lColor);
- pucData++;
- }
- pucDataMask += 3;
- }
- for (j = 0; j < nPadding; j++)
- {
- pucData++;
- pucDataMask++;
- }
- }
-
- //
- // Create a new bitmap and set the modified bits
- //
- wxBitmap vNewBmp( rBmp.GetWidth()
- ,rBmp.GetHeight()
- ,24
- );
- HBITMAP hNewBmp = (HBITMAP)vNewBmp.GetHBITMAP();
-
- if ((hOldBitmap = ::GpiSetBitmap(hPS, hNewBmp)) == HBM_ERROR)
- {
- vError = ::WinGetLastError(vHabmain);
- sError = wxPMErrorToStr(vError);
- }
- if ((lScansSet = ::GpiSetBitmapBits( hPS
- ,0L
- ,(LONG)rBmp.GetHeight()
- ,(PBYTE)pucBits
- ,&vInfo
- )) == GPI_ALTERROR)
+#include "wx/tooltip.h"
+#include "wx/os2/dcclient.h"
- {
- vError = ::WinGetLastError(vHabmain);
- sError = wxPMErrorToStr(vError);
- }
- vNewBmp.SetMask(rBmp.GetMask());
- free(pucBits);
- ::GpiSetBitmap(hPS, NULLHANDLE);
- ::GpiDestroyPS(hPS);
- ::DevCloseDC(hDC);
- if (vNewBmp.Ok())
- return(vNewBmp);
- return(wxNullBitmap);
-} // end of wxDisableBitmap
+bool wxToolBar::m_bInitialized = false;
// ----------------------------------------------------------------------------
// private classes
inline wxToolBarTool( wxToolBar* pTbar
,wxControl* pControl
+ ,const wxString& label
) : wxToolBarToolBase( pTbar
,pControl
+ ,label
)
{
}
// wxWin macros
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
EVT_SIZE(wxToolBar::OnSize)
EVT_PAINT(wxToolBar::OnPaint)
EVT_KILL_FOCUS(wxToolBar::OnKillFocus)
EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)
+ EVT_TIMER(-1, wxToolBar::OnTimer)
END_EVENT_TABLE()
// ============================================================================
wxToolBarToolBase *wxToolBar::CreateTool(
wxControl* pControl
+, const wxString& label
)
{
return new wxToolBarTool( this
,pControl
+ ,label
);
} // end of wxToolBarSimple::CreateTool
m_defaultWidth = 16;
m_defaultHeight = 15;
+
+ m_pToolTip = NULL;
} // end of wxToolBar::Init
wxToolBarToolBase* wxToolBar::DoAddTool(
);
} // end of wxToolBar::DoAddTool
-bool wxToolBar::DoInsertTool(
- size_t WXUNUSED(nPos)
-, wxToolBarToolBase* pToolBase
+bool wxToolBar::DeleteTool(
+ int nId
+)
+{
+ bool bOk = wxToolBarBase::DeleteTool(nId);
+
+ if (bOk)
+ {
+ Realize();
+ }
+ return bOk;
+} // end of wxToolBar::DeleteTool
+
+bool wxToolBar::DeleteToolByPos(
+ size_t nPos
+)
+{
+ bool bOk = wxToolBarBase::DeleteToolByPos(nPos);
+
+ if (bOk)
+ {
+ Realize();
+ }
+ return bOk;
+} // end of wxToolBar::DeleteTool
+
+wxToolBarToolBase* wxToolBar::InsertControl(
+ size_t nPos
+, wxControl* pControl
+)
+{
+ wxToolBarToolBase* pTool = wxToolBarBase::InsertControl( nPos
+ ,pControl
+ );
+ if (m_bInitialized)
+ {
+ Realize();
+ Refresh();
+ }
+ return pTool;
+} // end of wxToolBar::InsertControl
+
+wxToolBarToolBase* wxToolBar::InsertSeparator(
+ size_t nPos
+)
+{
+ wxToolBarToolBase* pTool = wxToolBarBase::InsertSeparator(nPos);
+
+ if (m_bInitialized)
+ {
+ Realize();
+ Refresh();
+ }
+ return pTool;
+} // end of wxToolBar::InsertSeparator
+
+wxToolBarToolBase* wxToolBar::InsertTool(
+ size_t nPos
+, int nId
+, const wxString& rsLabel
+, const wxBitmap& rBitmap
+, const wxBitmap& rBmpDisabled
+, wxItemKind eKind
+, const wxString& rsShortHelp
+, const wxString& rsLongHelp
+, wxObject* pClientData
)
{
- wxToolBarTool* pTool = (wxToolBarTool *)pToolBase;
+ wxToolBarToolBase* pTool = wxToolBarBase::InsertTool( nPos
+ ,nId
+ ,rsLabel
+ ,rBitmap
+ ,rBmpDisabled
+ ,eKind
+ ,rsShortHelp
+ ,rsLongHelp
+ ,pClientData
+ );
+ if (m_bInitialized)
+ {
+ Realize();
+ Refresh();
+ }
+ return pTool;
+} // end of wxToolBar::InsertTool
+
+bool wxToolBar::DoInsertTool( size_t WXUNUSED(nPos),
+ wxToolBarToolBase* pToolBase )
+{
+ wxToolBarTool* pTool = (wxToolBarTool *)pToolBase;
pTool->m_vX = m_vXPos;
if (pTool->m_vX == -1)
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
,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;
wxClientDC vDC(this);
vDC.SetFont(GetFont());
- vDC.GetTextExtent( "XXXX"
+ vDC.GetTextExtent( wxT("XXXX")
,&m_vTextX
,&m_vTextY
);
int nY = rPos.y;
int nWidth = rSize.x;
int nHeight = rSize.y;
- wxFrame* pFrame = wxDynamicCast(GetParent(), wxFrame);
- if (lStyle & wxTB_HORIZONTAL)
+ if (lStyle & (wxTB_TOP | wxTB_BOTTOM))
{
if (nWidth <= 0)
{
if (nHeight <= 0)
{
if (lStyle & wxTB_TEXT)
- nHeight = m_defaultHeight + 18;
+ nHeight = m_defaultHeight + m_vTextY;
else
nHeight = m_defaultHeight;
}
,nWidth
,nHeight
);
- return TRUE;
+ return true;
} // end of wxToolBar::Create
wxToolBar::~wxToolBar()
{
+ if (m_pToolTip)
+ {
+ delete m_pToolTip;
+ m_pToolTip = NULL;
+ }
} // end of wxToolBar::~wxToolBar
bool wxToolBar::Realize()
{
int nMaxToolWidth = 0;
int nMaxToolHeight = 0;
- int nX;
- int nY;
m_nCurrentRowsOrColumns = 0;
m_vLastX = m_xMargin;
//
// Find the maximum tool width and height
//
- wxToolBarToolsList::Node* pNode = m_tools.GetFirst();
+ wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
- while (pNode )
+ while (node )
{
- wxToolBarTool* pTool = (wxToolBarTool *)pNode->GetData();
+ wxToolBarTool* pTool = (wxToolBarTool *)node->GetData();
- if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().IsEmpty())
+ if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().empty())
{
//
// Set the height according to the font and the border size
//
- nMaxToolWidth = m_vTextX;
+ if (pTool->GetWidth() > m_vTextX)
+ nMaxToolWidth = pTool->GetWidth() + 4;
+ else
+ nMaxToolWidth = m_vTextX;
if (pTool->GetHeight() + m_vTextY > nMaxToolHeight)
nMaxToolHeight = pTool->GetHeight() + m_vTextY;
}
else
{
if (pTool->GetWidth() > nMaxToolWidth )
- nMaxToolWidth = pTool->GetWidth();
+ nMaxToolWidth = pTool->GetWidth() + 4;
if (pTool->GetHeight() > nMaxToolHeight)
nMaxToolHeight = pTool->GetHeight();
}
- pNode = pNode->GetNext();
+ node = node->GetNext();
+ }
+
+ wxCoord vTbWidth = 0L;
+ wxCoord vTbHeight = 0L;
+
+ GetSize( &vTbWidth
+ ,&vTbHeight
+ );
+ if (vTbHeight < nMaxToolHeight)
+ {
+ SetSize( -1L
+ ,-1L
+ ,vTbWidth
+ ,nMaxToolHeight + 4
+ );
+ if (GetParent()->IsKindOf(CLASSINFO(wxFrame)))
+ {
+ wxFrame* pFrame = wxDynamicCast(GetParent(), wxFrame);
+
+ if (pFrame)
+ pFrame->PositionToolBar();
+ }
}
int nSeparatorSize = m_toolSeparation;
- pNode = m_tools.GetFirst();
- while (pNode)
+ node = m_tools.GetFirst();
+ while (node)
{
- wxToolBarTool* pTool = (wxToolBarTool *)pNode->GetData();
+ wxToolBarTool* pTool = (wxToolBarTool *)node->GetData();
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;
if (m_nCurrentRowsOrColumns >= m_maxCols)
m_vLastY += nSeparatorSize;
else
- m_vLastX += nSeparatorSize;
+ m_vLastX += nSeparatorSize * 4;
}
else
{
if (m_nCurrentRowsOrColumns >= m_maxRows)
m_vLastX += nSeparatorSize;
else
- m_vLastY += nSeparatorSize;
+ m_vLastY += nSeparatorSize * 4;
}
}
else if (pTool->IsButton())
{
- if (GetWindowStyleFlag() & wxTB_HORIZONTAL)
+ if (GetWindowStyleFlag() & (wxTB_TOP | wxTB_BOTTOM))
{
if (m_nCurrentRowsOrColumns >= m_maxCols)
{
if (m_vLastY > m_maxHeight)
m_maxHeight = m_vLastY;
- pNode = pNode->GetNext();
+ 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;
- return TRUE;
+ m_bInitialized = true;
+ return true;
} // end of wxToolBar::Realize
// ----------------------------------------------------------------------------
return;
nCount++;
- for ( wxToolBarToolsList::Node* pNode = m_tools.GetFirst();
- pNode;
- pNode = pNode->GetNext() )
+ wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl();
+ ::WinFillRect(impl->GetHPS(), &impl->m_vRclPaint, GetBackgroundColour().GetPixel());
+ for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
+ node;
+ node = node->GetNext() )
{
- wxToolBarTool* pTool = (wxToolBarTool*)pNode->GetData();
+ wxToolBarTool* pTool = (wxToolBarTool*)node->GetData();
if (pTool->IsButton() )
DrawTool(vDc, pTool);
if (pTool->IsSeparator())
{
- wxPen vDarkGreyPen( wxColour(85, 85, 85)
- ,1
- ,wxSOLID
- );
- int nX;
- int nY;
- int nHeight;
+ wxColour gray85(85, 85, 85);
+ wxPen vDarkGreyPen( gray85, 1, wxSOLID );
+ int nX;
+ int nY;
+ int nHeight = 0;
+ int nWidth = 0;
vDc.SetPen(vDarkGreyPen);
- if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().IsEmpty())
+ if (HasFlag(wxTB_TEXT))
{
- nX = pTool->m_vX;
- nY = pTool->m_vY - (m_vTextY - 6);
- nHeight = (m_vTextY - 2) + pTool->GetHeight();
+ if (HasFlag(wxTB_TOP) || HasFlag(wxTB_BOTTOM))
+ {
+ nX = pTool->m_vX;
+ nY = pTool->m_vY - (m_vTextY - 6);
+ nHeight = (m_vTextY - 2) + pTool->GetHeight();
+ }
+ else
+ {
+ nX = pTool->m_vX + m_xMargin + 10;
+ nY = pTool->m_vY + m_vTextY + m_toolSeparation;
+ nWidth = pTool->GetWidth() > m_vTextX ? pTool->GetWidth() : m_vTextX;
+ }
}
else
{
nX = pTool->m_vX;
nY = pTool->m_vY;
- nHeight = pTool->GetHeight() - 2;
+ if (HasFlag(wxTB_TOP) || HasFlag(wxTB_BOTTOM))
+ nHeight = pTool->GetHeight() - 2;
+ else
+ {
+ nX += m_xMargin + 10;
+ nY += m_yMargin + m_toolSeparation;
+ nWidth = pTool->GetWidth();
+ }
}
- vDc.DrawLine(nX, nY, nX, nY + nHeight);
+ vDc.DrawLine(nX, nY, nX + nWidth, nY + nHeight);
}
}
nCount--;
wxMouseEvent& rEvent
)
{
+ POINTL vPoint;
+ HWND hWnd;
wxCoord vX;
wxCoord vY;
HPOINTER hPtr = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_ARROW, FALSE);
::WinSetPointer(HWND_DESKTOP, hPtr);
+ ::WinQueryPointerPos(HWND_DESKTOP, &vPoint);
+ hWnd = ::WinWindowFromPoint(HWND_DESKTOP, &vPoint, TRUE);
+ if (hWnd != (HWND)GetHwnd())
+ {
+ m_vToolTimer.Stop();
+ return;
+ }
+
rEvent.GetPosition(&vX, &vY);
wxToolBarTool* pTool = (wxToolBarTool *)FindToolForPosition( vX
if (!pTool)
{
+ m_vToolTimer.Stop();
if (m_nCurrentTool > -1)
{
if (rEvent.LeftIsDown())
SpringUpButton(m_nCurrentTool);
pTool = (wxToolBarTool *)FindById(m_nCurrentTool);
- if (pTool && pTool->IsToggled())
+ if (pTool && !pTool->IsToggled())
{
- RaiseTool( pTool
- ,FALSE
- );
+ RaiseTool( pTool, FALSE );
}
m_nCurrentTool = -1;
OnMouseEnter(-1);
}
DrawTool(pTool);
}
+ wxToolBarTool* pOldTool = (wxToolBarTool*)FindById(m_nCurrentTool);
+
+ if (pOldTool && !pTool->IsToggled())
+ RaiseTool( pOldTool, FALSE );
m_nCurrentTool = pTool->GetId();
OnMouseEnter(m_nCurrentTool);
+ if (!pTool->GetShortHelp().empty())
+ {
+ if (m_pToolTip)
+ delete m_pToolTip;
+ m_pToolTip = new wxToolTip(pTool->GetShortHelp());
+ m_vXMouse = (wxCoord)vPoint.x;
+ m_vYMouse = (wxCoord)vPoint.y;
+ m_vToolTimer.Start(1000L, TRUE);
+ }
if (!pTool->IsToggled())
RaiseTool(pTool);
}
// 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;
- wxPen vDarkGreyPen( wxColour( 85,85,85 )
- ,1
- ,wxSOLID
- );
- wxPen vWhitePen( wxT("WHITE")
- ,1
- ,wxSOLID
- );
- wxPen vBlackPen( wxT("BLACK")
- ,1
- ,wxSOLID
- );
- wxBitmap vBitmap = pTool->GetNormalBitmap();
- bool bUseMask = FALSE;
- wxMask* pMask = NULL;
- RECTL vRect;
+ wxToolBarTool* pTool = (wxToolBarTool *)pToolBase;
+ wxColour gray85( 85,85,85 );
+ wxPen vDarkGreyPen( gray85, 1, wxSOLID );
+ wxBitmap vBitmap = pTool->GetNormalBitmap();
+ bool bUseMask = false;
+ wxMask* pMask = NULL;
PrepareDC(rDc);
return;
if ((pMask = vBitmap.GetMask()) != NULL)
if (pMask->GetMaskBitmap() != NULLHANDLE)
- bUseMask = TRUE;
+ bUseMask = true;
if (!pTool->IsToggled())
{
LowerTool(pTool, FALSE);
if (!pTool->IsEnabled())
{
- wxColour vColor("GREY");
+ wxColour vColor(wxT("GREY"));
rDc.SetTextForeground(vColor);
if (!pTool->GetDisabledBitmap().Ok())
}
else
{
- wxColour vColor("BLACK");
-
- rDc.SetTextForeground(vColor);
+ rDc.SetTextForeground(*wxBLACK);
rDc.DrawBitmap( vBitmap
,pTool->m_vX
,pTool->m_vY
,&vX
,&vY
);
- vLeft += (wxCoord)((m_vTextX - vX)/2);
- rDc.DrawText( pTool->GetLabel()
- ,vLeft
- ,pTool->m_vY + m_vTextY + 4 // a bit of margin
- );
+ if (pTool->GetWidth() > vX) // large tools
+ {
+ vLeft = pTool->m_vX + (pTool->GetWidth() - vX);
+ GetSize(&vX, &vY);
+ rDc.DrawText( pTool->GetLabel()
+ ,vLeft
+ ,vY - m_vTextY - 1
+ );
+ }
+ else // normal tools
+ {
+ vLeft += (wxCoord)((m_vTextX - vX)/2);
+ rDc.DrawText( pTool->GetLabel()
+ ,vLeft
+ ,pTool->m_vY + m_vTextY - 1 // a bit of margin
+ );
+ }
}
}
else
{
- wxColour vColor("GREY");
+ wxColour vColor(wxT("GREY"));
LowerTool(pTool);
rDc.SetTextForeground(vColor);
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
);
}
}
, wxCoord vY
) const
{
- wxCoord vTextX = 0;
- wxCoord vTextY = 0;
wxCoord vTBarHeight = 0;
- wxToolBarToolsList::Node* pNode = m_tools.GetFirst();
- while (pNode)
+ GetSize( NULL
+ ,&vTBarHeight
+ );
+ vY = vTBarHeight - vY;
+ wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
+ while (node)
{
- wxToolBarTool* pTool = (wxToolBarTool *)pNode->GetData();
+ wxToolBarTool* pTool = (wxToolBarTool *)node->GetData();
if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().IsNull())
{
return pTool;
}
}
- pNode = pNode->GetNext();
+ node = node->GetNext();
}
return (wxToolBarToolBase *)NULL;
} // end of wxToolBar::FindToolForPosition
// private helpers
// ----------------------------------------------------------------------------
-void wxToolBar::LowerTool (
- wxToolBarToolBase* pToolBase
-, bool bLower
-)
+void wxToolBar::LowerTool ( wxToolBarToolBase* pToolBase,
+ bool bLower )
{
wxToolBarTool* pTool = (wxToolBarTool*)pToolBase;
- wxCoord vX;
- wxCoord vY;
- wxCoord vWidth;
- wxCoord vHeight;
- wxPen vDarkGreyPen( wxColour(85, 85, 85)
- ,1
- ,wxSOLID
- );
- wxPen vWhitePen( "WHITE"
- ,1
- ,wxSOLID
- );
- wxPen vClearPen( GetBackgroundColour()
- ,1
- ,wxSOLID
- );
- wxClientDC vDC(this);
+ wxCoord vX;
+ wxCoord vY;
+ wxCoord vWidth;
+ wxCoord vHeight;
+ wxColour gray85( 85,85,85 );
+ wxPen vDarkGreyPen( gray85, 1, wxSOLID );
+ wxPen vClearPen( GetBackgroundColour(), 1, wxSOLID );
+ wxClientDC vDC(this);
if (!pTool)
return;
if (!HasFlag(wxTB_FLAT))
return;
- if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().IsEmpty())
+ if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().empty())
{
- vX = pTool->m_vX - (wxCoord)(pTool->GetWidth()/2);
+ if (pTool->GetWidth() > m_vTextX)
+ {
+ vX = pTool->m_vX - 2;
+ vWidth = pTool->GetWidth() + 4;
+ }
+ else
+ {
+ vX = pTool->m_vX - (wxCoord)(pTool->GetWidth()/2);
+ vWidth = m_vTextX + 4;
+ }
vY = pTool->m_vY - 2;
- vWidth = m_vTextX + 4;
vHeight = pTool->GetHeight() + m_vTextY + 2;
}
else
{
- vX = pTool->m_vX;
+ vX = pTool->m_vX - 2;
vY = pTool->m_vY - 2;
vWidth = pTool->GetWidth() + 4;
vHeight = pTool->GetHeight() + 4;
}
if (bLower)
{
- vDC.SetPen(vWhitePen);
+ vDC.SetPen(*wxWHITE_PEN);
vDC.DrawLine(vX + vWidth, vY + vHeight, vX, vY + vHeight);
vDC.DrawLine(vX + vWidth, vY, vX + vWidth, vY + vHeight);
vDC.SetPen(vDarkGreyPen);
}
} // end of WinGuiBase_CToolBarTool::LowerTool
-void wxToolBar::RaiseTool (
- wxToolBarToolBase* pToolBase
-, bool bRaise
-)
+void wxToolBar::RaiseTool ( wxToolBarToolBase* pToolBase,
+ bool bRaise )
{
- wxToolBarTool* pTool = (wxToolBarTool*)pToolBase;
- wxCoord vX;
- wxCoord vY;
- wxCoord vWidth;
- wxCoord vHeight;
- wxPen vDarkGreyPen( wxColour(85, 85, 85)
- ,1
- ,wxSOLID
- );
- wxPen vWhitePen( "WHITE"
- ,1
- ,wxSOLID
- );
- wxPen vClearPen( GetBackgroundColour()
- ,1
- ,wxSOLID
- );
- wxClientDC vDC(this);
+ wxToolBarTool* pTool = (wxToolBarTool*)pToolBase;
+ wxCoord vX;
+ wxCoord vY;
+ wxCoord vWidth;
+ wxCoord vHeight;
+ wxColour gray85( 85,85,85 );
+ wxPen vDarkGreyPen( gray85, 1, wxSOLID );
+ wxPen vClearPen( GetBackgroundColour(), 1, wxSOLID );
+ wxClientDC vDC(this);
if (!pTool)
return;
if (!HasFlag(wxTB_FLAT))
return;
- if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().IsEmpty())
+ if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().empty())
{
- vX = pTool->m_vX - (wxCoord)(pTool->GetWidth()/2);
+ if (pTool->GetWidth() > m_vTextX)
+ {
+ vX = pTool->m_vX - 2;
+ vWidth = pTool->GetWidth() + 4;
+ }
+ else
+ {
+ vX = pTool->m_vX - (wxCoord)(pTool->GetWidth()/2);
+ vWidth = m_vTextX + 4;
+ }
vY = pTool->m_vY - 2;
- vWidth = m_vTextX + 4;
vHeight = pTool->GetHeight() + m_vTextY + 2;
}
else
{
- vX = pTool->m_vX;
+ vX = pTool->m_vX - 2;
vY = pTool->m_vY - 2;
vWidth = pTool->GetWidth() + 4;
vHeight = pTool->GetHeight() + 4;
vDC.SetPen(vDarkGreyPen);
vDC.DrawLine(vX + vWidth, vY + vHeight, vX, vY + vHeight);
vDC.DrawLine(vX + vWidth, vY, vX + vWidth, vY + vHeight);
- vDC.SetPen(vWhitePen);
+ vDC.SetPen(*wxWHITE_PEN);
vDC.DrawLine(vX, vY, vX + vWidth, vY);
vDC.DrawLine(vX, vY + vHeight, vX, vY);
}
}
} // end of wxToolBar::RaiseTool
+void wxToolBar::OnTimer ( wxTimerEvent& rEvent )
+{
+ if (rEvent.GetId() == m_vToolTimer.GetId())
+ {
+ wxPoint vPos( m_vXMouse, m_vYMouse );
+
+ m_pToolTip->DisplayToolTipWindow(vPos);
+ m_vToolTimer.Stop();
+ m_vToolExpTimer.Start(4000L, TRUE);
+ }
+ else if (rEvent.GetId() == m_vToolExpTimer.GetId())
+ {
+ m_pToolTip->HideToolTipWindow();
+ GetParent()->Refresh();
+ m_vToolExpTimer.Stop();
+ }
+} // end of wxToolBar::OnTimer
+
#endif // ndef for wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE
projects / wxWidgets.git / blobdiff