Changeset 2289 for trunk/src

Timestamp:

Jan 1, 2000, 3:37:35 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

Location:

trunk/src/user32

Files:

• pmframe.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (2 diffs)
• win32wbase.h (modified) (2 diffs)
• win32wnd.cpp (modified) (2 diffs)

trunk/src/user32/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.31 1999-12-29 22:54:01 cbratschi Exp $ */
+/* $Id: pmframe.cpp,v 1.32 2000-01-01 14:37:34 cbratschi Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -230 +230 @@
   switch(msg)
   {
+    case WM_FORMATFRAME:
+      dprintf(("PMFRAME: WM_FORMATFRAME %x",hwnd));
+      //CB: call WM_NCCALCSIZE and set client pos
+      //    WM_PAINT -> WM_NCPAINT
+      //    WM_HITTEST -> MsgHitTest()
+      //    mouse messages -> MsgButton()
+      goto RunDefFrameProc;
+
+    case WM_QUERYBORDERSIZE:
+      //CB: todo: set to 0
+      goto RunDefFrameProc;
+
     case WM_ADJUSTWINDOWPOS:
     {
@@ -429 +441 @@
     case WM_PAINT:
       #ifdef PMFRAMELOG
-       dprintf(("PMFRAME: WM_PAINT"));
+       dprintf(("PMFRAME: WM_PAINT %x",hwnd));
       #endif
       if (!win32wnd->isChild())

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.130 2000-01-01 12:18:07 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.131 2000-01-01 14:37:34 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2906 +2906 @@
 //******************************************************************************
 //******************************************************************************
+CHAR *Win32BaseWindow::getWindowNamePtrA()
+{
+    INT len = GetWindowTextLength();
+    CHAR *text;
+
+    if (len == 0) return NULL;
+    len++;
+    text = (CHAR*)malloc(len*sizeof(CHAR));
+    GetWindowTextA(text,len);
+
+    return text;
+}
+//******************************************************************************
+//******************************************************************************
+WCHAR *Win32BaseWindow::getWindowNamePtrW()
+{
+    INT len = GetWindowTextLength();
+    WCHAR *text;
+
+    if (len == 0) return NULL;
+    len++;
+    text = (WCHAR*)malloc(len*sizeof(WCHAR));
+    GetWindowTextW(text,len);
+
+    return text;
+}
+//******************************************************************************
+//******************************************************************************
+VOID Win32BaseWindow::freeWindowNamePtr(PVOID namePtr)
+{
+    if (namePtr) free(namePtr);
+}
+//******************************************************************************
+//******************************************************************************
 int Win32BaseWindow::GetWindowTextLength()
 {

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.62 1999-12-30 18:33:00 cbratschi Exp $ */
+/* $Id: win32wbase.h,v 1.63 2000-01-01 14:37:35 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -194 +194 @@
          BOOL   SetWindowTextW(LPWSTR lpsz);
          BOOL   hasWindowName(LPSTR wndname, BOOL fUnicode = 0);
+         CHAR  *getWindowNamePtrA();
+         WCHAR *getWindowNamePtrW();
+         VOID   freeWindowNamePtr(PVOID namePtr);
+         CHAR  *getWindowNameA()              { return windowNameA; }; //only for MDI windows!
+         WCHAR *getWindowNameW()              { return windowNameW; }; //only for MDI windows!
 Win32WndClass  *getClass()  { return windowClass; };
-        //CB: windowNameA isn't always the window name!
-        char   *getWindowNameA()                    { return windowNameA; };
 Win32BaseWindow *getOwner()                         { return owner; };
         void    setOwner(Win32BaseWindow *newOwner) { owner = newOwner; };

trunk/src/user32/win32wnd.cpp

@@ -1 @@
-/* $Id: win32wnd.cpp,v 1.4 1999-12-18 16:31:52 cbratschi Exp $ */
+/* $Id: win32wnd.cpp,v 1.5 2000-01-01 14:37:35 cbratschi Exp $ */
 /*
  * Win32 Window Class for OS/2
@@ -69 +69 @@
         case WM_SETTEXT:
             //CB: infinite loop
-            //window->updateFrameText(MDI_REPAINTFRAME,(LPCSTR)lParam);
+            window->updateFrameText(MDI_REPAINTFRAME,(LPCSTR)lParam);
             return 0;
 #endif