Changeset 2440 for trunk/src/user32/new/win32wbase.cpp

Timestamp:

Jan 14, 2000, 6:48:33 PM (26 years ago)

Author:

cbratschi

Message:

DrawCaption performance improvements for window text updates

File:

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

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.41 2000-01-14 14:45:17 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.42 2000-01-14 17:48:32 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1253 +1253 @@
     {
         LPCSTR lpsz = (LPCSTR)lParam;
-
-        if(windowNameA) free(windowNameA);
-        if(windowNameW) free(windowNameW);
+        CHAR* oldNameA = windowNameA;
+        WCHAR* oldNameW = windowNameW;
 
         if (lParam)
@@ -1272 +1271 @@
         }
         dprintf(("WM_SETTEXT of %x to %s\n", Win32Hwnd, lParam));
-        if (dwStyle & WS_CAPTION)
-        {
-          //CB: optimize!
-          HandleNCPaint(0);
-        }
-/* //CB: endless loop in trackbar.exe -> to fix
-        if(OS2HwndFrame && (dwStyle & WS_CAPTION) == WS_CAPTION)
-          return OSLibWinSetWindowText(OS2HwndFrame,(LPSTR)windowNameA);
-*/
+        if ((dwStyle & WS_CAPTION) && (lstrcmpA(oldNameA,windowNameA) != 0))
+        {
+          UpdateCaptionText();
+          OSLibWinSetWindowText(OS2HwndFrame,(LPSTR)windowNameA);
+        }
+
+        if(oldNameA) free(oldNameA);
+        if(oldNameW) free(oldNameW);
+
         return TRUE;
     }
@@ -1679 +1678 @@
         LPWSTR lpsz = (LPWSTR)lParam;
 
-        if(windowNameA) free(windowNameA);
-        if(windowNameW) free(windowNameW);
+        CHAR* oldNameA = windowNameA;
+        WCHAR* oldNameW = windowNameW;
 
         if (lParam)
@@ -1696 +1695 @@
           wndNameLength = 0;
         }
-
-        if(OS2HwndFrame && (dwStyle & WS_CAPTION) == WS_CAPTION)
-          return OSLibWinSetWindowText(OS2HwndFrame,(LPSTR)windowNameA);
+        dprintf(("WM_SETTEXT of %x\n",Win32Hwnd));
+        if ((dwStyle & WS_CAPTION) && (lstrcmpW(oldNameW,windowNameW) != 0))
+        {
+          UpdateCaptionText();
+          OSLibWinSetWindowText(OS2HwndFrame,(LPSTR)windowNameA);
+        }
+
+        if(oldNameA) free(oldNameA);
+        if(oldNameW) free(oldNameW);
 
         return TRUE;