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

streamlined WM_NOTIFY processing code fixing a bug with toolbar tooltips in presence of the control in toolbar

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-06-27 23:40:55 +00:00
parent 25f430fcc4
commit 2b15b970e0
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/msw/window.cpp
View File

@@ -3021,7 +3021,7 @@ bool wxWindowMSW::MSWCreate(const wxChar *wclass,
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
#ifdef __WIN95__ #ifdef __WIN95__
// FIXME: VZ: I'm not sure at all that the order of processing is correct
bool wxWindowMSW::HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) bool wxWindowMSW::HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
{ {
#ifndef __WXMICROWIN__ #ifndef __WXMICROWIN__
@@ -3029,12 +3029,19 @@ bool wxWindowMSW::HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
HWND hWnd = hdr->hwndFrom; HWND hWnd = hdr->hwndFrom;
wxWindow *win = wxFindWinFromHandle((WXHWND)hWnd); wxWindow *win = wxFindWinFromHandle((WXHWND)hWnd);
// is this one of our windows? // if the control is one of our windows, let it handle the message itself
if ( win ) if ( win )
{ {
return win->MSWOnNotify(idCtrl, lParam, result); return win->MSWOnNotify(idCtrl, lParam, result);
} }
// VZ: why did we do it? normally this is unnecessary and, besides, it
// breaks the message processing for the toolbars because the tooltip
// notifications were being forwarded to the toolbar child controls
// (if it had any) before being passed to the toolbar itself, so in my
// example the tooltip for the combobox was always shown instead of the
// correct button tooltips
#if 0
// try all our children // try all our children
wxWindowList::Node *node = GetChildren().GetFirst(); wxWindowList::Node *node = GetChildren().GetFirst();
while ( node ) while ( node )
@@ -3047,8 +3054,9 @@ bool wxWindowMSW::HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
node = node->GetNext(); node = node->GetNext();
} }
#endif // 0
// finally try this window too (catches toolbar case) // by default, handle it ourselves
return MSWOnNotify(idCtrl, lParam, result); return MSWOnNotify(idCtrl, lParam, result);
#else // __WXMICROWIN__ #else // __WXMICROWIN__
return FALSE; return FALSE;
@@ -3131,6 +3139,7 @@ bool wxWindowMSW::MSWOnNotify(int WXUNUSED(idCtrl),
return FALSE; return FALSE;
} }
#endif // __WIN95__ #endif // __WIN95__
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------