AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

detabified

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-07-09 23:31:00 +00:00
parent 938b652b11
commit d0a3d10946
1 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/msw/window.cpp
View File

@ -424,7 +424,7 @@ void wxWindowMSW::SetFocus()
#ifndef __WXMICROWIN__
::SetLastError(0);
#endif
if ( !::SetFocus(hWnd) )
{
// was there really an error?
@ -499,7 +499,7 @@ bool wxWindowMSW::Show(bool show)
#ifdef __WXMICROWIN__
// It seems that MicroWindows brings the _parent_ of the
// window to the top, which can be the wrong one.
/* activate (set focus to) specified window*/
::SetFocus(hWnd);
@ -523,7 +523,7 @@ void wxWindowMSW::Raise()
#ifdef __WXMICROWIN__
// It seems that MicroWindows brings the _parent_ of the
// window to the top, which can be the wrong one.
/* activate (set focus to) specified window*/
::SetFocus(GetHwnd());
@ -947,7 +947,7 @@ void wxWindowMSW::SubclassWin(WXHWND hWnd)
m_oldWndProc = (WXFARPROC) GetWindowLong(hwnd, GWL_WNDPROC);
wxASSERT( (WXFARPROC) m_oldWndProc != (WXFARPROC) wxWndProc );
SetWindowLong(hwnd, GWL_WNDPROC, (LONG) wxWndProc);
}
@ -2163,35 +2163,35 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
case WM_MBUTTONDOWN:
case WM_MBUTTONUP:
case WM_MBUTTONDBLCLK:
{
processed = FALSE;
{
processed = FALSE;
#ifdef __WXMICROWIN__
// MicroWindows seems to ignore the fact that a window
// is disabled. So catch mouse events and throw them away if necessary.
wxWindowMSW* win = this;
while (win)
{
if (!win->IsEnabled())
{
processed = TRUE;
break;
}
win = win->GetParent();
if (win && win->IsTopLevel())
break;
}
// MicroWindows seems to ignore the fact that a window
// is disabled. So catch mouse events and throw them away if necessary.
wxWindowMSW* win = this;
while (win)
{
if (!win->IsEnabled())
{
processed = TRUE;
break;
}
win = win->GetParent();
if (win && win->IsTopLevel())
break;
}
#endif
if (!processed)
{
if (!processed)
{
if (message == WM_LBUTTONDOWN && AcceptsFocus())
SetFocus();
processed = HandleMouseEvent(message,
GET_X_LPARAM(lParam),
GET_Y_LPARAM(lParam),
wParam);
}
wParam);
}
break;
}
}
#ifdef __WXMICROWIN__
case WM_NCLBUTTONDOWN:
@ -2204,28 +2204,27 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
case WM_NCMBUTTONDOWN:
case WM_NCMBUTTONUP:
case WM_NCMBUTTONDBLCLK:
#endif
{
// MicroWindows seems to ignore the fact that a window
// is disabled. So catch mouse events and throw them away if necessary.
processed = FALSE;
wxWindowMSW* win = this;
while (win)
{
if (!win->IsEnabled())
{
processed = TRUE;
break;
}
win = win->GetParent();
if (win && win->IsTopLevel())
break;
}
break;
#endif
{
// MicroWindows seems to ignore the fact that a window
// is disabled. So catch mouse events and throw them away if necessary.
processed = FALSE;
wxWindowMSW* win = this;
while (win)
{
if (!win->IsEnabled())
{
processed = TRUE;
break;
}
win = win->GetParent();
if (win && win->IsTopLevel())
break;
}
break;
}
#endif
#ifdef MM_JOY1MOVE // __WXMICROWIN__
case MM_JOY1MOVE:
case MM_JOY2MOVE: