Changeset 1762 for trunk/src/user32

Timestamp:

Nov 17, 1999, 6:06:23 PM (26 years ago)

Author:

cbratschi

Message:

cursor handling fixed

Location:

trunk/src/user32

Files:

• button.cpp (modified) (2 diffs)
• combo.cpp (modified) (4 diffs)
• edit.cpp (modified) (3 diffs)
• listbox.cpp (modified) (2 diffs)
• pmwindow.cpp (modified) (3 diffs)
• scroll.cpp (modified) (9 diffs)
• win32class.h (modified) (3 diffs)
• win32dlg.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.17 1999-11-13 16:42:40 cbratschi Exp $ */
+/* $Id: button.cpp,v 1.18 1999-11-17 17:04:51 cbratschi Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -283 +283 @@
   }
 
-  return 1; //SvL: Bugfix -> PMWINDOW expects non-zero return value if
-            //               we want to restore the default mouse cursor
+  return 0;
 }
 

trunk/src/user32/combo.cpp

@@ -1 @@
-/* $Id: combo.cpp,v 1.12 1999-11-13 16:42:41 cbratschi Exp $ */
+/* $Id: combo.cpp,v 1.13 1999-11-17 17:04:52 cbratschi Exp $ */
 /*
  * Combo controls
@@ -1673 +1673 @@
    {
        lphc->wState |= CBF_BUTTONDOWN;
+MessageBeep(MB_OK); //CB:
        if( lphc->wState & CBF_DROPPED )
        {
@@ -1851 +1852 @@
                 return SendMessageA( lphc->hWndLBox, LB_GETTEXTLEN, j, 0);
                 }
-                else if( lphc->wState & CBF_EDIT )
-                {
-                    lphc->wState |= CBF_NOEDITNOTIFY;
-
-                    return SendMessageA( lphc->hWndEdit, message, wParam, lParam );
-                }
-                else return  CB_ERR;
+                else if( lphc->wState & CBF_EDIT )
+                {
+                    lphc->wState |= CBF_NOEDITNOTIFY;
+
+                    return SendMessageA( lphc->hWndEdit, message, wParam, lParam );
+                }
+                else return  CB_ERR;
         case WM_DRAWITEM:
         case WM_DELETEITEM:
@@ -1903 +1904 @@
                 if( lphc->wState & CBF_CAPTURE )
                     COMBO_MouseMove( lphc, wParam, lParam );
-                return  TRUE;
+                return  0;
         /* Combo messages */
 

trunk/src/user32/edit.cpp

@@ -1 @@
-/* $Id: edit.cpp,v 1.14 1999-11-13 16:42:41 cbratschi Exp $ */
+/* $Id: edit.cpp,v 1.15 1999-11-17 17:04:52 cbratschi Exp $ */
 /*
  *      Edit control
@@ -2627 +2627 @@
         switch (c) {
         case '\r':
-            /* If the edit doesn't want the return and it's not a multiline edit, do nothing */
-            if(!(es->style & ES_MULTILINE) && !(es->style & ES_WANTRETURN))
-                break;
+            /* If the edit doesn't want the return and it's not a multiline edit, do nothing */
+            if(!(es->style & ES_MULTILINE) && !(es->style & ES_WANTRETURN))
+                break;
         case '\n':
                 if (es->style & ES_MULTILINE) {
@@ -3285 +3285 @@
         EDIT_EM_SetSel(hwnd, es, es->selection_start, e, after_wrap);
 
-        return 1; //SvL: Bugfix -> PMWINDOW expects non-zero return value if
-                  //               we want to restore the default mouse cursor
+        return 0;
 }
 

trunk/src/user32/listbox.cpp

@@ -1 @@
-/* $Id: listbox.cpp,v 1.12 1999-11-13 16:42:41 cbratschi Exp $ */
+/* $Id: listbox.cpp,v 1.13 1999-11-17 17:04:53 cbratschi Exp $ */
 /*
  * Listbox controls
@@ -2547 +2547 @@
             LISTBOX_HandleMouseMove( hwnd, descr, (INT16)LOWORD(lParam),
                                      (INT16)HIWORD(lParam) );
-        return 1; //SvL: Bugfix -> PMWINDOW expects non-zero return value if
-                  //               we want to restore the default mouse cursor
+        return 0;
 
     case WM_LBUTTONUP:

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.53 1999-11-09 19:23:16 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.54 1999-11-17 17:04:53 cbratschi Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -603 +603 @@
 
         //OS/2 Window coordinates -> Win32 Window coordinates
-        if(win32wnd->MsgMouseMove(keystate, SHORT1FROMMP(mp1), MapOS2ToWin32Y(win32wnd, SHORT2FROMMP(mp1))))
-        {
-                //Changes mouse cursor to default
-                goto RunDefWndProc;
-        }
+        win32wnd->MsgMouseMove(keystate, SHORT1FROMMP(mp1), MapOS2ToWin32Y(win32wnd, SHORT2FROMMP(mp1)));
         break;
     }
@@ -758 +754 @@
         //      the newly generated WM_CHAR message.
         if(fTranslated && !((flags & KC_KEYUP) == KC_KEYUP))
-        {//TranslatedMessage was called before DispatchMessage, so send WM_CHAR messages
+        {//TranslatedMessage was called before DispatchMessage, so send WM_CHAR messages
             ULONG keyflags = 0, vkey = 0;
             ULONG fl = SHORT1FROMMP(mp1);

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.22 1999-11-13 16:42:42 cbratschi Exp $ */
+/* $Id: scroll.cpp,v 1.23 1999-11-17 17:04:54 cbratschi Exp $ */
 /*
  * Scrollbar control
@@ -713 +713 @@
     HDC hdc;
     POINT pt;
-    LRESULT res = (msg == WM_MOUSEMOVE) ? 1:0;
+    LRESULT res = 0;
 
     SCROLLBAR_INFO *infoPtr = SCROLL_GetInfoPtr(hwnd,nBar);
@@ -726 +726 @@
         if (!(dwStyle & SBS_SIZEGRIP)) return res;
 
-        if (msg == WM_MOUSEMOVE)
+        if (msg == WM_SETCURSOR)
         {
           RECT rect;
 
           SCROLL_GetSizeBox(hwnd,dwStyle,&rect);
-          pt.x = (SHORT)LOWORD(lParam);
-          pt.y = (SHORT)HIWORD(lParam);
+          GetCursorPos(&pt);
+          ScreenToClient(hwnd,&pt);
 
           if (PtInRect(&rect,pt))
           {
             SetCursor(LoadCursorA(0,IDC_SIZENWSEA));
-            return 0;
+            return TRUE;
           }
+
+          return DefWindowProcA(hwnd,WM_SETCURSOR,wParam,lParam);
         } else if (msg == WM_LBUTTONDOWN)
         {
@@ -766 +768 @@
     }
 
+    if (msg == WM_SETCURSOR) return DefWindowProcA(hwnd,WM_SETCURSOR,wParam,lParam);
     if (!SCROLL_Scrolling && msg != WM_LBUTTONDOWN) return res;
 
@@ -1126 +1129 @@
     case WM_CAPTURECHANGED:
     case WM_MOUSEMOVE:
+    case WM_SETCURSOR:
     case WM_SYSTIMER:
     case WM_SETFOCUS:
@@ -1203 +1207 @@
     case WM_CAPTURECHANGED:
     case WM_MOUSEMOVE:
+    case WM_SETCURSOR:
     case WM_SYSTIMER:
     case WM_SETFOCUS:
@@ -1257 +1262 @@
     case WM_CAPTURECHANGED:
     case WM_MOUSEMOVE:
+    case WM_SETCURSOR:
     case WM_SYSTIMER:
     case WM_SETFOCUS:
@@ -1542 +1548 @@
 }
 
-// CB: functions to get 32bit SB_THUMBTRACK position, for internal use
+// CB: functions to get 32bit SB_THUMBTRACK position, for internal use (controls)
+//     not supported by Windows, Windows only delivers the 16bit value
 
 BOOL IsScrollBarTracking(HWND hwnd,INT nBar)
@@ -1551 +1558 @@
 }
 
-INT GetScrollTrackPos(HWND hwnd,INT nBar)
+INT WINAPI GetScrollTrackPos(HWND hwnd,INT nBar)
 {
   SCROLLBAR_INFO *infoPtr;

trunk/src/user32/win32class.h

@@ -1 @@
-/* $Id: win32class.h,v 1.4 1999-11-01 19:11:43 sandervl Exp $ */
+/* $Id: win32class.h,v 1.5 1999-11-17 17:04:54 cbratschi Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -45 +45 @@
 
          HICON  getIcon()               { return hIcon; };
+        HCURSOR getCursor()             { return hCursor; };
 
         HBRUSH  getBackgroundBrush()    { return backgroundBrush; };
@@ -57 +58 @@
           BOOL  hasClassName(LPSTR classname, BOOL fUnicode = 0);
 
-          BOOL  isAppClass(ULONG curProcessId);
+          BOOL  isAppClass(ULONG curProcessId);
 
  static  void   UnregisterClassA(HINSTANCE hinst, LPSTR id);

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.34 1999-11-14 16:35:56 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.35 1999-11-17 17:04:54 cbratschi Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -639 +639 @@
              windowNameA = UnicodeToAsciiString((LPWSTR)info.windowName);
         }
-        else windowNameA = (char *)info.windowName;
+        else windowNameA = (char *)info.windowName;
 
         hwndCtrl = ::CreateWindowExA( info.exStyle | WS_EX_NOPARENTNOTIFY,
@@ -1070 +1070 @@
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = 0;
-    wndClass.hCursor       = (HCURSOR)IDC_ARROWA;
+    wndClass.hCursor       = LoadCursorA(0,IDC_ARROWA);
     wndClass.hbrBackground = GetSysColorBrush(COLOR_BTNFACE);
     wndClass.lpszClassName = DIALOG_CLASS_NAMEA;

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.84 1999-11-14 16:35:56 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.85 1999-11-17 17:04:55 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1570 +1570 @@
             }
         }
-        return 1;
+        if (wParam == Win32Hwnd)
+        {
+          HCURSOR hCursor = windowClass ? windowClass->getCursor():LoadCursorA(0,IDC_ARROWA);
+
+          if (hCursor) SetCursor(hCursor);
+          return 1;
+        } else return 0;
     }
     case WM_MOUSEMOVE:
-        return 1; //Let OS/2 change the mouse cursor back to the default
+        return 0; //we do our own cursor handling
 
     case WM_WINDOWPOSCHANGED: