detabified

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

View File

@@ -424,7 +424,7 @@ void wxWindowMSW::SetFocus()
#ifndef __WXMICROWIN__ #ifndef __WXMICROWIN__
::SetLastError(0); ::SetLastError(0);
#endif #endif
if ( !::SetFocus(hWnd) ) if ( !::SetFocus(hWnd) )
{ {
// was there really an error? // was there really an error?
@@ -499,7 +499,7 @@ bool wxWindowMSW::Show(bool show)
#ifdef __WXMICROWIN__ #ifdef __WXMICROWIN__
// It seems that MicroWindows brings the _parent_ of the // It seems that MicroWindows brings the _parent_ of the
// window to the top, which can be the wrong one. // window to the top, which can be the wrong one.
/* activate (set focus to) specified window*/ /* activate (set focus to) specified window*/
::SetFocus(hWnd); ::SetFocus(hWnd);
@@ -523,7 +523,7 @@ void wxWindowMSW::Raise()
#ifdef __WXMICROWIN__ #ifdef __WXMICROWIN__
// It seems that MicroWindows brings the _parent_ of the // It seems that MicroWindows brings the _parent_ of the
// window to the top, which can be the wrong one. // window to the top, which can be the wrong one.
/* activate (set focus to) specified window*/ /* activate (set focus to) specified window*/
::SetFocus(GetHwnd()); ::SetFocus(GetHwnd());
@@ -947,7 +947,7 @@ void wxWindowMSW::SubclassWin(WXHWND hWnd)
m_oldWndProc = (WXFARPROC) GetWindowLong(hwnd, GWL_WNDPROC); m_oldWndProc = (WXFARPROC) GetWindowLong(hwnd, GWL_WNDPROC);
wxASSERT( (WXFARPROC) m_oldWndProc != (WXFARPROC) wxWndProc ); wxASSERT( (WXFARPROC) m_oldWndProc != (WXFARPROC) wxWndProc );
SetWindowLong(hwnd, GWL_WNDPROC, (LONG) 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_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,28 +2204,27 @@ 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
#ifdef MM_JOY1MOVE // __WXMICROWIN__ #ifdef MM_JOY1MOVE // __WXMICROWIN__
case MM_JOY1MOVE: case MM_JOY1MOVE:
case MM_JOY2MOVE: case MM_JOY2MOVE: