Changeset 3182 for trunk/src/comctl32/nativefont.cpp

Timestamp:

Mar 21, 2000, 6:30:46 PM (25 years ago)

Author:

cbratschi

Message:

bug fixes and improvements

File:

• trunk/src/comctl32/nativefont.cpp (modified) (3 diffs)

trunk/src/comctl32/nativefont.cpp

@@ -1 @@
-/* $Id: nativefont.cpp,v 1.2 2000-03-17 17:13:23 cbratschi Exp $ */
+/* $Id: nativefont.cpp,v 1.3 2000-03-21 17:30:43 cbratschi Exp $ */
 /*
  * Native Font control
@@ -5 +5 @@
  * Copyright 1998, 1999 Eric Kohl
  * Copyright 1999 Achim Hasenmueller
+ * Copyright 2000 Christoph Bratschi
  *
  * NOTES
@@ -53 +54 @@
 }
 
+static VOID NATIVEFONT_Draw(HWND hwnd,HDC hdc,RECT *updateRect)
+{
+  drawStubControl(hwnd,hdc);
+}
 
+static LRESULT NATIVEFONT_Paint(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  HDC hdc = (HDC)wParam;
 
-static LRESULT WINAPI
-NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+  if (!hdc)
+  {
+    PAINTSTRUCT ps;
+
+    hdc = BeginPaint(hwnd,&ps);
+    NATIVEFONT_Draw(hwnd, hdc,&ps.rcPaint);
+    EndPaint(hwnd,&ps);
+  } else
+      NATIVEFONT_Draw(hwnd,hdc,NULL);
+
+  return 0;
+}
+
+static LRESULT WINAPI NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-    switch (uMsg)
-    {
+  switch (uMsg)
+  {
+    case WM_CREATE:
+      return NATIVEFONT_Create(hwnd,wParam,lParam);
 
-        case WM_CREATE:
-            return NATIVEFONT_Create (hwnd, wParam, lParam);
+    case WM_DESTROY:
+      return NATIVEFONT_Destroy(hwnd,wParam,lParam);
 
-        case WM_DESTROY:
-            return NATIVEFONT_Destroy (hwnd, wParam, lParam);
+    case WM_PAINT:
+      return NATIVEFONT_Paint(hwnd,wParam,lParam);
 
-        default:
-//          ERR (nativefont, "unknown msg %04x wp=%08x lp=%08lx\n",
-//                   uMsg, wParam, lParam);
-            return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
-    }
-    return 0;
+    default:
+      return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
+  }
+  return 0;
 }