#endif
#include "wx/tooltip.h"
+#include "wx/os2/dcclient.h"
bool wxToolBar::m_bInitialized = false;
wxToolBar::~wxToolBar()
{
- if (m_pToolTip)
- {
- delete m_pToolTip;
- m_pToolTip = NULL;
- }
+ wxDELETE(m_pToolTip);
} // end of wxToolBar::~wxToolBar
bool wxToolBar::Realize()
return;
nCount++;
- ::WinFillRect(vDc.GetHPS(), &vDc.m_vRclPaint, GetBackgroundColour().GetPixel());
+ 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() )
int nRows
)
{
- wxCHECK_RET( nRows != 0, _T("max number of rows must be > 0") );
+ wxCHECK_RET( nRows != 0, wxT("max number of rows must be > 0") );
m_maxCols = (GetToolsCount() + nRows - 1) / nRows;
Refresh();
}
node = node->GetNext();
}
- return (wxToolBarToolBase *)NULL;
+ return NULL;
} // end of wxToolBar::FindToolForPosition
// ----------------------------------------------------------------------------