X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1b806b98241ab649c169aaa1f134df85e80fb8b..43f4e852a1b2ac37c3db6a2b87315192ac549191:/src/msw/wince/tbarwce.cpp diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp index e8a3119150..a2e2847ea2 100644 --- a/src/msw/wince/tbarwce.cpp +++ b/src/msw/wince/tbarwce.cpp @@ -372,7 +372,7 @@ bool wxToolMenuBar::Realize() #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(); @@ -403,7 +403,7 @@ bool wxToolMenuBar::Realize() const wxString& label = tool->GetLabel(); if ( !label.empty() ) { - button.iString = (int)label.wx_str(); + button.iString = (int) wxMSW_CONV_LPCTSTR(label); } }