// Skip over the menus
if (GetMenuBar())
pos += GetMenuBar()->GetMenuCount();
-
+
// the main difficulty we have here is with the controls in the toolbars:
// as we (sometimes) use several separators to cover up the space used by
// them, the indices are not the same for us and the toolbar
#endif // 0
bool lastWasRadio = false;
- wxToolBarToolsList::Node* node;
+ wxToolBarToolsList::compatibility_iterator node;
for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
{
wxToolMenuBarTool *tool = (wxToolMenuBarTool*) node->GetData();
const wxString& label = tool->GetLabel();
if ( !label.empty() )
{
- button.iString = (int)label.wx_str();
+ button.iString = (int) wxMSW_CONV_LPCTSTR(label);
}
}
}
int n = 0;
- if ( bmpToUse.Ok() )
+ if ( bmpToUse.IsOk() )
{
n = ::CommandBar_AddBitmap( (HWND) GetHWND(), NULL, (int) (HBITMAP) bmpToUse.GetHBITMAP(),
1, 16, 16 );
if ( !tool->CanBeToggled() || tool->GetKind() != wxITEM_RADIO || toggled )
{
// OnLeftClick() can veto the button state change - for buttons which
- // may be toggled only, of couse
+ // may be toggled only, of course.
if ( !OnLeftClick((int)id, toggled) && tool->CanBeToggled() )
{
// revert back