detabified
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2163,35 +2163,35 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
|
|||||||
case WM_MBUTTONDOWN:
|
case WM_MBUTTONDOWN:
|
||||||
case WM_MBUTTONUP:
|
case WM_MBUTTONUP:
|
||||||
case WM_MBUTTONDBLCLK:
|
case WM_MBUTTONDBLCLK:
|
||||||
{
|
{
|
||||||
processed = FALSE;
|
processed = FALSE;
|
||||||
#ifdef __WXMICROWIN__
|
#ifdef __WXMICROWIN__
|
||||||
// MicroWindows seems to ignore the fact that a window
|
// MicroWindows seems to ignore the fact that a window
|
||||||
// is disabled. So catch mouse events and throw them away if necessary.
|
// is disabled. So catch mouse events and throw them away if necessary.
|
||||||
wxWindowMSW* win = this;
|
wxWindowMSW* win = this;
|
||||||
while (win)
|
while (win)
|
||||||
{
|
{
|
||||||
if (!win->IsEnabled())
|
if (!win->IsEnabled())
|
||||||
{
|
{
|
||||||
processed = TRUE;
|
processed = TRUE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
win = win->GetParent();
|
win = win->GetParent();
|
||||||
if (win && win->IsTopLevel())
|
if (win && win->IsTopLevel())
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if (!processed)
|
if (!processed)
|
||||||
{
|
{
|
||||||
if (message == WM_LBUTTONDOWN && AcceptsFocus())
|
if (message == WM_LBUTTONDOWN && AcceptsFocus())
|
||||||
SetFocus();
|
SetFocus();
|
||||||
processed = HandleMouseEvent(message,
|
processed = HandleMouseEvent(message,
|
||||||
GET_X_LPARAM(lParam),
|
GET_X_LPARAM(lParam),
|
||||||
GET_Y_LPARAM(lParam),
|
GET_Y_LPARAM(lParam),
|
||||||
wParam);
|
wParam);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef __WXMICROWIN__
|
#ifdef __WXMICROWIN__
|
||||||
case WM_NCLBUTTONDOWN:
|
case WM_NCLBUTTONDOWN:
|
||||||
@@ -2204,25 +2204,24 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
|
|||||||
case WM_NCMBUTTONDOWN:
|
case WM_NCMBUTTONDOWN:
|
||||||
case WM_NCMBUTTONUP:
|
case WM_NCMBUTTONUP:
|
||||||
case WM_NCMBUTTONDBLCLK:
|
case WM_NCMBUTTONDBLCLK:
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
// MicroWindows seems to ignore the fact that a window
|
// MicroWindows seems to ignore the fact that a window
|
||||||
// is disabled. So catch mouse events and throw them away if necessary.
|
// is disabled. So catch mouse events and throw them away if necessary.
|
||||||
processed = FALSE;
|
processed = FALSE;
|
||||||
wxWindowMSW* win = this;
|
wxWindowMSW* win = this;
|
||||||
while (win)
|
while (win)
|
||||||
{
|
{
|
||||||
if (!win->IsEnabled())
|
if (!win->IsEnabled())
|
||||||
{
|
{
|
||||||
processed = TRUE;
|
processed = TRUE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
win = win->GetParent();
|
win = win->GetParent();
|
||||||
if (win && win->IsTopLevel())
|
if (win && win->IsTopLevel())
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user