detabified some more

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-07-09 23:35:24 +00:00
parent d0a3d10946
commit cd4453e588

View File

@@ -497,15 +497,15 @@ bool wxWindowMSW::Show(bool show)
if ( show ) if ( 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);
/* raise top level parent to top of z order*/ // raise top level parent to top of z order
::SetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, ::SetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0,
SWP_NOMOVE|SWP_NOSIZE); SWP_NOMOVE|SWP_NOSIZE);
#else #else
BringWindowToTop(hWnd); BringWindowToTop(hWnd);
#endif #endif
@@ -521,15 +521,14 @@ void wxWindowMSW::Raise()
::BringWindowToTop(GetHwnd()); ::BringWindowToTop(GetHwnd());
#else // Win32 #else // Win32
#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());
/* raise top level parent to top of z order*/ // raise top level parent to top of z order
::SetWindowPos(GetHwnd(), HWND_TOP, 0, 0, 0, 0, ::SetWindowPos(GetHwnd(), HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
SWP_NOMOVE|SWP_NOSIZE);
#else #else
::SetForegroundWindow(GetHwnd()); ::SetForegroundWindow(GetHwnd());
#endif #endif
@@ -2166,8 +2165,9 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
{ {
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
// is disabled. So catch mouse events and throw them away if necessary. // disabled. So catch mouse events and throw them away if
// necessary.
wxWindowMSW* win = this; wxWindowMSW* win = this;
while (win) while (win)
{ {
@@ -2180,7 +2180,7 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
if (win && win->IsTopLevel()) if (win && win->IsTopLevel())
break; break;
} }
#endif #endif // __WXMICROWIN__
if (!processed) if (!processed)
{ {
if (message == WM_LBUTTONDOWN && AcceptsFocus()) if (message == WM_LBUTTONDOWN && AcceptsFocus())
@@ -2223,9 +2223,9 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
} }
break; break;
} }
#endif #endif // __WXMICROWIN__
#ifdef MM_JOY1MOVE // __WXMICROWIN__ #ifdef MM_JOY1MOVE
case MM_JOY1MOVE: case MM_JOY1MOVE:
case MM_JOY2MOVE: case MM_JOY2MOVE:
case MM_JOY1ZMOVE: case MM_JOY1ZMOVE:
@@ -2239,7 +2239,7 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
GET_Y_LPARAM(lParam), GET_Y_LPARAM(lParam),
wParam); wParam);
break; break;
#endif #endif // __WXMICROWIN__
case WM_SYSCOMMAND: case WM_SYSCOMMAND:
processed = HandleSysCommand(wParam, lParam); processed = HandleSysCommand(wParam, lParam);
@@ -2262,7 +2262,7 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
#endif // Win95 #endif // Win95
// for these messages we must return TRUE if process the message // for these messages we must return TRUE if process the message
#ifdef WM_DRAWITEM // __WXMICROWIN__ #ifdef WM_DRAWITEM
case WM_DRAWITEM: case WM_DRAWITEM:
case WM_MEASUREITEM: case WM_MEASUREITEM:
{ {
@@ -2282,7 +2282,8 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
rc.result = TRUE; rc.result = TRUE;
} }
break; break;
#endif #endif // defined(WM_DRAWITEM)
case WM_GETDLGCODE: case WM_GETDLGCODE:
if ( m_lDlgCode ) if ( m_lDlgCode )
{ {
@@ -2418,7 +2419,7 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
lParam); lParam);
} }
break; break;
#endif #endif // !__WXMICROWIN__
// the return value for this message is ignored // the return value for this message is ignored
case WM_SYSCOLORCHANGE: case WM_SYSCOLORCHANGE:
@@ -2810,8 +2811,7 @@ bool wxWindowMSW::MSWCreate(int id,
} }
else // creating a normal window, not a dialog else // creating a normal window, not a dialog
#endif #endif // !__WXMICROWIN__
// __WXMICROWIN__
{ {
int controlId = 0; int controlId = 0;
if ( style & WS_CHILD ) if ( style & WS_CHILD )
@@ -2908,7 +2908,7 @@ bool wxWindowMSW::HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
// finally try this window too (catches toolbar case) // finally try this window too (catches toolbar case)
return MSWOnNotify(idCtrl, lParam, result); return MSWOnNotify(idCtrl, lParam, result);
#else #else // __WXMICROWIN__
return FALSE; return FALSE;
#endif #endif
} }
@@ -3143,7 +3143,7 @@ bool wxWindowMSW::HandleDropFiles(WXWPARAM wParam)
delete[] files; delete[] files;
return rc; return rc;
#else #else // __WXMICROWIN__
return FALSE; return FALSE;
#endif #endif
} }
@@ -3229,7 +3229,8 @@ bool wxWindowMSW::HandleSetCursor(WXHWND WXUNUSED(hWnd),
// cursor set, stop here // cursor set, stop here
return TRUE; return TRUE;
} }
#endif #endif // __WXMICROWIN__
// pass up the window chain // pass up the window chain
return FALSE; return FALSE;
} }
@@ -3345,7 +3346,7 @@ bool wxWindowMSW::HandleCtlColor(WXHBRUSH *brush,
*brush = hBrush; *brush = hBrush;
return hBrush != 0; return hBrush != 0;
#else #else // __WXMICROWIN__
return FALSE; return FALSE;
#endif #endif
} }
@@ -4420,7 +4421,8 @@ wxKeyboardHook(int nCode, WORD wParam, DWORD lParam)
return (int)CallNextHookEx(wxTheKeyboardHook, nCode, wParam, lParam); return (int)CallNextHookEx(wxTheKeyboardHook, nCode, wParam, lParam);
} }
#endif
#endif // !__WXMICROWIN__
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
const char *wxGetMessageName(int message) const char *wxGetMessageName(int message)