minus one show stopper typo and a couple of warnings on mingw.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -430,7 +430,7 @@ bool wxWindowMSW::Create(wxWindow *parent,
|
|||||||
msflags |= WS_VISIBLE;
|
msflags |= WS_VISIBLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool retValue = MSWCreate(wxCanvasClassName, NULL, pos, size, msflags, exstyle);
|
bool retVal = MSWCreate(wxCanvasClassName, NULL, pos, size, msflags, exstyle);
|
||||||
if (retVal)
|
if (retVal)
|
||||||
SetWindowLong( (HWND)m_hWnd, GWL_WNDPROC, (LONG)wxWndProc);
|
SetWindowLong( (HWND)m_hWnd, GWL_WNDPROC, (LONG)wxWndProc);
|
||||||
return retVal;
|
return retVal;
|
||||||
@@ -3078,7 +3078,7 @@ bool wxWindowMSW::HandleTooltipNotify(WXUINT code,
|
|||||||
// we need to handle it as well, otherwise no tooltips will be shown in
|
// we need to handle it as well, otherwise no tooltips will be shown in
|
||||||
// this case
|
// this case
|
||||||
|
|
||||||
if ( !(code == TTN_NEEDTEXTA || code == TTN_NEEDTEXTW) || ttip.empty() )
|
if ( !(code == (WXUINT) TTN_NEEDTEXTA || code == (WXUINT) TTN_NEEDTEXTW) || ttip.empty() )
|
||||||
{
|
{
|
||||||
// not a tooltip message or no tooltip to show anyhow
|
// not a tooltip message or no tooltip to show anyhow
|
||||||
return FALSE;
|
return FALSE;
|
||||||
@@ -3086,7 +3086,7 @@ bool wxWindowMSW::HandleTooltipNotify(WXUINT code,
|
|||||||
|
|
||||||
LPTOOLTIPTEXT ttText = (LPTOOLTIPTEXT)lParam;
|
LPTOOLTIPTEXT ttText = (LPTOOLTIPTEXT)lParam;
|
||||||
|
|
||||||
if ( code == TTN_NEEDTEXTA )
|
if ( code == (WXUINT) TTN_NEEDTEXTA )
|
||||||
{
|
{
|
||||||
ttText->lpszText = (wxChar *)ttip.c_str();
|
ttText->lpszText = (wxChar *)ttip.c_str();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user