Changeset 1801 for trunk/src/user32/static.cpp

Timestamp:

Nov 21, 1999, 6:07:52 PM (26 years ago)

Author:

cbratschi

Message:

fixed window text handling

File:

• trunk/src/user32/static.cpp (modified) (5 diffs)

trunk/src/user32/static.cpp

@@ -1 @@
-/* $Id: static.cpp,v 1.10 1999-11-21 14:37:17 achimha Exp $ */
+/* $Id: static.cpp,v 1.11 1999-11-21 17:07:51 cbratschi Exp $ */
 /*
  * Static control
@@ -14 +14 @@
 
 #include <stdlib.h>
+#include <string.h>
 #include <os2win.h>
 #include "controls.h"
@@ -321 +322 @@
   UpdateWindow(hwnd);
 
-  return 0;
+  return TRUE;
+}
+
+LRESULT STATIC_GetText(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  DWORD style = GetWindowLongA(hwnd,GWL_STYLE) & SS_TYPEMASK;
+
+  if (style == SS_ICON)
+  {
+    STATICINFO* infoPtr = (STATICINFO*)GetInfoPtr(hwnd);
+
+    if (wParam < 4 || !lParam) return 0;
+    memcpy((VOID*)lParam,&infoPtr->hIcon,4);
+
+    return 4;
+  } else return DefWindowProcA(hwnd,WM_GETTEXT,wParam,lParam);
+}
+
+LRESULT STATIC_GetTextLength(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  DWORD style = GetWindowLongA(hwnd,GWL_STYLE) & SS_TYPEMASK;
+
+  if (style == SS_ICON) return 4;
+  else return DefWindowProcA(hwnd,WM_GETTEXTLENGTH,wParam,lParam);
 }
 
@@ -479 +503 @@
     case WM_SETTEXT:
       return STATIC_SetText(hwnd,wParam,lParam);
+
+    case WM_GETTEXT:
+      return STATIC_GetText(hwnd,wParam,lParam);
+
+    case WM_GETTEXTLENGTH:
+      return STATIC_GetTextLength(hwnd,wParam,lParam);
 
     case WM_SETFONT:
@@ -722 +752 @@
     switch (dwStyle & SS_TYPEMASK)
     {
-        case SS_ETCHEDHORZ:
-            DrawEdge(hdc,&rc,EDGE_ETCHED,BF_TOP|BF_BOTTOM);
-            break;
-        case SS_ETCHEDVERT:
-            DrawEdge(hdc,&rc,EDGE_ETCHED,BF_LEFT|BF_RIGHT);
-            break;
+        case SS_ETCHEDHORZ:
+            DrawEdge(hdc,&rc,EDGE_ETCHED,BF_TOP|BF_BOTTOM);
+            break;
+        case SS_ETCHEDVERT:
+            DrawEdge(hdc,&rc,EDGE_ETCHED,BF_LEFT|BF_RIGHT);
+            break;
         case SS_ETCHEDFRAME:
             DrawEdge (hdc, &rc, EDGE_ETCHED, BF_RECT);