projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
recognize schemes other than http and ftp in wxLaunchDefaultBrowser()
[wxWidgets.git]
/
src
/
os2
/
toolbar.cpp
diff --git
a/src/os2/toolbar.cpp
b/src/os2/toolbar.cpp
index 230adb16e860033b87da0002da4e1199d8a1bcf3..ebceb00abba3f819b8f9391dade7dd5b22c5a94b 100644
(file)
--- a/
src/os2/toolbar.cpp
+++ b/
src/os2/toolbar.cpp
@@
-26,6
+26,7
@@
#endif
#include "wx/tooltip.h"
#endif
#include "wx/tooltip.h"
+#include "wx/os2/dcclient.h"
bool wxToolBar::m_bInitialized = false;
bool wxToolBar::m_bInitialized = false;
@@
-60,8
+61,10
@@
public:
inline wxToolBarTool( wxToolBar* pTbar
,wxControl* pControl
inline wxToolBarTool( wxToolBar* pTbar
,wxControl* pControl
+ ,const wxString& label
) : wxToolBarToolBase( pTbar
,pControl
) : wxToolBarToolBase( pTbar
,pControl
+ ,label
)
{
}
)
{
}
@@
-128,10
+131,12
@@
wxToolBarToolBase* wxToolBar::CreateTool(
wxToolBarToolBase *wxToolBar::CreateTool(
wxControl* pControl
wxToolBarToolBase *wxToolBar::CreateTool(
wxControl* pControl
+, const wxString& label
)
{
return new wxToolBarTool( this
,pControl
)
{
return new wxToolBarTool( this
,pControl
+ ,label
);
} // end of wxToolBarSimple::CreateTool
);
} // end of wxToolBarSimple::CreateTool
@@
-597,7
+602,8
@@
void wxToolBar::OnPaint (
return;
nCount++;
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() )
for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
node;
node = node->GetNext() )
@@
-973,7
+979,7
@@
wxToolBarToolBase* wxToolBar::FindToolForPosition(
}
node = node->GetNext();
}
}
node = node->GetNext();
}
- return
(wxToolBarToolBase *)
NULL;
+ return NULL;
} // end of wxToolBar::FindToolForPosition
// ----------------------------------------------------------------------------
} // end of wxToolBar::FindToolForPosition
// ----------------------------------------------------------------------------
@@
-1165,7
+1171,7
@@
void wxToolBar::RaiseTool ( wxToolBarToolBase* pToolBase,
void wxToolBar::OnTimer ( wxTimerEvent& rEvent )
{
void wxToolBar::OnTimer ( wxTimerEvent& rEvent )
{
- if (rEvent.GetId() == m_vToolTimer.Get
Timer
Id())
+ if (rEvent.GetId() == m_vToolTimer.GetId())
{
wxPoint vPos( m_vXMouse, m_vYMouse );
{
wxPoint vPos( m_vXMouse, m_vYMouse );
@@
-1173,7
+1179,7
@@
void wxToolBar::OnTimer ( wxTimerEvent& rEvent )
m_vToolTimer.Stop();
m_vToolExpTimer.Start(4000L, TRUE);
}
m_vToolTimer.Stop();
m_vToolExpTimer.Start(4000L, TRUE);
}
- else if (rEvent.GetId() == m_vToolExpTimer.Get
Timer
Id())
+ else if (rEvent.GetId() == m_vToolExpTimer.GetId())
{
m_pToolTip->HideToolTipWindow();
GetParent()->Refresh();
{
m_pToolTip->HideToolTipWindow();
GetParent()->Refresh();