Changeset 988 for trunk/src

Timestamp:

Sep 20, 1999, 5:59:27 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

• trunk/src/comctl32/hotkey.c (modified) (8 diffs)

trunk/src/comctl32/hotkey.c

@@ -1 @@
-/* $Id: hotkey.c,v 1.6 1999-09-19 13:27:09 cbratschi Exp $ */
+/* $Id: hotkey.c,v 1.7 1999-09-20 15:59:27 cbratschi Exp $ */
 /*
  * Hotkey control
@@ -22 +22 @@
 
 static VOID
-HOTKEY_UpdateHotKey(HWND hwnd);
+HOTKEY_Refresh(HWND hwnd)
+{
+  InvalidateRect(hwnd,NULL,FALSE);
+}
+
 
 static BYTE
@@ -49 +53 @@
   infoPtr->bfMods = HOTKEY_Check(infoPtr,(wParam & 0xFF00)>>8);
 
-  HOTKEY_UpdateHotKey(hwnd);
+  HOTKEY_Refresh(hwnd);
 
   return 0;
@@ -74 +78 @@
 
   infoPtr->bfMods = HOTKEY_Check(infoPtr,infoPtr->bfMods);
-  if (infoPtr->bfMods != oldMods) HOTKEY_UpdateHotKey(hwnd);
+  if (infoPtr->bfMods != oldMods) HOTKEY_Refresh(hwnd);
 
   return 0;
@@ -184 +188 @@
 
     infoPtr->bfMods = newMods;
-    HOTKEY_UpdateHotKey(hwnd);
+    HOTKEY_Refresh(hwnd);
 
     return TRUE;
@@ -274 +278 @@
   DrawTextA(hdc,text,strlen(text),&newRect,DT_LEFT | DT_BOTTOM | DT_SINGLELINE | DT_CALCRECT);
   if (infoPtr->hFont) SelectObject(hdc,oldFont);
-  infoPtr->cursorPos.x = (newRect.right >= rect.right)? -1:newRect.right;
+  infoPtr->cursorPos.x = (newRect.right >= rect.right)? 3:newRect.right;
   SetCaretPos(infoPtr->cursorPos.x,infoPtr->cursorPos.y);
   ShowCaret(hwnd);
@@ -296 +300 @@
 }
 
-
-static VOID
-HOTKEY_UpdateHotKey(HWND hwnd)
-{
-  HDC hdc;
-  RECT rect;
-  HBRUSH hBrush;
-
-  GetClientRect(hwnd,&rect);
-  InflateRect(&rect,2,2);
-  hdc = GetDC(hwnd);
-  hBrush = (HBRUSH)SendMessageA(GetParent(hwnd),WM_CTLCOLOREDIT,hdc,(LPARAM)hwnd);
-  if (!hBrush) hBrush = (HBRUSH)GetStockObject(WHITE_BRUSH);
-  FillRect(hdc,&rect,hBrush);
-  HOTKEY_Draw(hwnd,hdc);
-  ReleaseDC(hwnd,hdc);
-}
 
 static LRESULT
@@ -350 +337 @@
     ReleaseDC (hwnd, hdc);
 
-    if (LOWORD(lParam)) HOTKEY_UpdateHotKey(hwnd);
+    if (LOWORD(lParam)) HOTKEY_Refresh(hwnd);
 
     return 0;