Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tooltip bug (which I introduced recently) corrected

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-04-10 22:24:32 +00:00
parent 639a9fb5d7
commit 8df136714c
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/msw/tbar95.cpp
View File

@@ -255,7 +255,7 @@ bool wxToolBar95::CreateTools()
replaceBitmap.nIDNew = (UINT) (HBITMAP) m_hBitmap; replaceBitmap.nIDNew = (UINT) (HBITMAP) m_hBitmap;
replaceBitmap.nButtons = noButtons; replaceBitmap.nButtons = noButtons;
if (::SendMessage((HWND) GetHWND(), TB_REPLACEBITMAP, (WPARAM) 0, (LPARAM) &replaceBitmap) == -1) if (::SendMessage((HWND) GetHWND(), TB_REPLACEBITMAP, (WPARAM) 0, (LPARAM) &replaceBitmap) == -1)
wxMessageBox("Could not add bitmap to toolbar"); wxFAIL_MSG("Could not add bitmap to toolbar");
::DeleteObject((HBITMAP) oldToolBarBitmap); ::DeleteObject((HBITMAP) oldToolBarBitmap);
@@ -274,7 +274,7 @@ bool wxToolBar95::CreateTools()
addBitmap.hInst = 0; addBitmap.hInst = 0;
addBitmap.nID = (UINT)m_hBitmap; addBitmap.nID = (UINT)m_hBitmap;
if (::SendMessage((HWND) GetHWND(), TB_ADDBITMAP, (WPARAM) noButtons, (LPARAM) &addBitmap) == -1) if (::SendMessage((HWND) GetHWND(), TB_ADDBITMAP, (WPARAM) noButtons, (LPARAM) &addBitmap) == -1)
wxMessageBox("Could not add bitmap to toolbar"); wxFAIL_MSG("Could not add bitmap to toolbar");
} }
// Now add the buttons. // Now add the buttons.
@@ -370,28 +370,37 @@ bool wxToolBar95::MSWNotify(WXWPARAM WXUNUSED(wParam),
wxToolBarTool *tool = (wxToolBarTool *)node->Data(); wxToolBarTool *tool = (wxToolBarTool *)node->Data();
if ( tool->m_shortHelpString != "" ) const wxString& help = tool->m_shortHelpString;
if ( !help.IsEmpty() )
{ {
if ( hdr->code == TTN_NEEDTEXTA ) if ( hdr->code == TTN_NEEDTEXTA )
{ {
ttText->lpszText = (char *)(const char *)tool->m_shortHelpString; ttText->lpszText = (char *)help.c_str();
} }
#if (_WIN32_IE >= 0x0300) #if (_WIN32_IE >= 0x0300)
else else
{ {
// FIXME this is a temp hack only until I understand better what // FIXME this is a temp hack only until I understand better what
// must be done in both ANSI and Unicode builds // must be done in both ANSI and Unicode builds
size_t lenAnsi = tool->m_shortHelpString.Len();
size_t lenAnsi = help.Len();
#ifdef __MWERKS__ #ifdef __MWERKS__
wchar_t *pwz = new wchar_t[lenAnsi * 2 + 1]; // MetroWerks doesn't like calling mbstowcs with NULL argument
size_t lenUnicode = 2*lenAnsi;
#else #else
size_t lenUnicode = mbstowcs(NULL, tool->m_shortHelpString, lenAnsi); size_t lenUnicode = mbstowcs(NULL, help, lenAnsi);
wchar_t *pwz = new wchar_t[lenUnicode + 1];
#endif #endif
mbstowcs(pwz, tool->m_shortHelpString, lenAnsi + 1);
memcpy(ttText->szText, pwz, // using the pointer of right type avoids us doing all sorts of
(sizeof(ttText->szText) - 1)/sizeof(ttText->szText[0])); // pointer arithmetics ourselves
ttText->szText[WXSIZEOF(ttText->szText)] = 0; wchar_t *dst = (wchar_t *)ttText->szText,
*pwz = new wchar_t[lenUnicode + 1];
mbstowcs(pwz, help, lenAnsi + 1);
memcpy(dst, pwz, lenUnicode*sizeof(wchar_t));
// put the terminating _wide_ NUL
dst[lenUnicode] = 0;
delete [] pwz; delete [] pwz;
} }