Changeset 1258 for trunk/src

Timestamp:

Oct 12, 1999, 8:14:56 PM (26 years ago)

Author:

sandervl

Message:

Lots of changes again

Location:

trunk/src/user32

Files:

• Makefile (modified) (2 diffs)
• button.cpp (modified) (2 diffs)
• edit.cpp (modified) (3 diffs)
• listbox.cpp (modified) (4 diffs)
• oslibwin.cpp (modified) (5 diffs)
• oslibwin.h (modified) (2 diffs)
• win32wbase.cpp (modified) (4 diffs)

trunk/src/user32/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.29 1999-10-12 14:47:21 sandervl Exp $
+# $Id: Makefile,v 1.30 1999-10-12 18:14:53 sandervl Exp $
 
 #
@@ -82 +82 @@
 button.obj: button.cpp $(PDWIN32_INCLUDE)\win\button.h
 static.obj: static.cpp $(PDWIN32_INCLUDE)\win\static.h
-scroll.obj: scroll.cpp $(PDWIN32_INCLUDE)\win\scroll.h win32wbase.h
+scroll.obj: scroll.cpp $(PDWIN32_INCLUDE)\win\scroll.h win32wbase.h oslibwin.h
 listbox.obj: listbox.cpp $(PDWIN32_INCLUDE)\win\combo.h
 combo.obj: combo.cpp $(PDWIN32_INCLUDE)\win\combo.h

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.8 1999-10-10 11:26:34 cbratschi Exp $ */
+/* $Id: button.cpp,v 1.9 1999-10-12 18:14:53 sandervl Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -257 +257 @@
   }
 
-  return 0;
+  return 1; //SvL: Bugfix -> PMWINDOW expects non-zero return value if
+            //               we want to restore the default mouse cursor
 }
 

trunk/src/user32/edit.cpp

@@ -1 @@
-/* $Id: edit.cpp,v 1.2 1999-10-08 21:24:07 cbratschi Exp $ */
+/* $Id: edit.cpp,v 1.3 1999-10-12 18:14:54 sandervl Exp $ */
 /*
  *      Edit control
@@ -3216 +3216 @@
 
         if (GetCapture() != hwnd)
-                return 0;
+                return 1; //SvL: Bugfix
 
         /*
@@ -3228 +3228 @@
         e = EDIT_CharFromPos(hwnd, es, x, y, &after_wrap);
         EDIT_EM_SetSel(hwnd, es, es->selection_start, e, after_wrap);
-        return 0;
+
+        return 1; //SvL: Bugfix -> PMWINDOW expects non-zero return value if
+                  //               we want to restore the default mouse cursor
 }
 

trunk/src/user32/listbox.cpp

@@ -1 @@
-/* $Id: listbox.cpp,v 1.2 1999-10-08 21:24:40 cbratschi Exp $ */
+/* $Id: listbox.cpp,v 1.3 1999-10-12 18:14:55 sandervl Exp $ */
 /*
  * Listbox controls
@@ -186 +186 @@
     {
         info.nMin  = 0;
-        info.nMax  = (descr->nb_items - 1) / descr->page_size;
+        info.nMax = (descr->nb_items - 1) / descr->page_size;
         info.nPos  = descr->top_item / descr->page_size;
         info.nPage = descr->width / descr->column_width;
@@ -201 +201 @@
     {
         info.nMin  = 0;
-        info.nMax  = descr->nb_items - 1;
-        info.nPos  = descr->top_item;
+        info.nMax = descr->nb_items - 1;
+//        info.nPos  = descr->top_item;
+        info.nPos = descr->selected_item - 1;
         info.nPage = LISTBOX_GetCurrentPageSize( hwnd, descr );
         info.fMask = SIF_RANGE | SIF_POS | SIF_PAGE;
         if (descr->style & LBS_DISABLENOSCROLL)
             info.fMask |= SIF_DISABLENOSCROLL;
-        SetScrollInfo( hwnd, SB_VERT, &info, TRUE );
+
+        if(info.nMax > (INT)info.nPage) {
+            ShowScrollBar(hwnd, SB_VERT, TRUE);
+            EnableScrollBar(hwnd, SB_VERT, ESB_ENABLE_BOTH);            
+            SetScrollInfo( hwnd, SB_VERT, &info, TRUE );
+        }
+        else {
+            ShowScrollBar(hwnd, SB_VERT, FALSE);
+            EnableScrollBar(hwnd, SB_VERT, ESB_DISABLE_BOTH);           
+        }
 
         if (descr->horz_extent)
@@ -2550 +2560 @@
             LISTBOX_HandleMouseMove( hwnd, descr, (INT16)LOWORD(lParam),
                                      (INT16)HIWORD(lParam) );
-        return 0;
+        return 1; //SvL: Bugfix -> PMWINDOW expects non-zero return value if
+                  //               we want to restore the default mouse cursor
+
     case WM_LBUTTONUP:
         return LISTBOX_HandleLButtonUp( hwnd, descr );

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.22 1999-10-12 14:47:22 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.23 1999-10-12 18:14:55 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -622 +622 @@
             y = parentHeight - y - pswpOld->cy;
          }
+         else     y = parentHeight - y - cy;
       }
-
+      else     y = parentHeight - y - cy;
+ 
       if (flags & SWP_SIZE)
       {
@@ -635 +637 @@
       }
 
-      y = parentHeight - y - cy;
-
-      if ((pswpOld->x == x) && (pswpOld->y == y))
+       if ((pswpOld->x == x) && (pswpOld->y == y))
          flags &= ~SWP_MOVE;
 
@@ -738 +738 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinShowScrollBar(HWND hwndParent, HWND hwndScroll, int scrollBar, BOOL fShow)
+BOOL OSLibWinShowScrollBar(HWND hwndParent, HWND hwndScroll, int scrollBar, 
+                           BOOL fShow, BOOL fForceChange)
 {
    if(hwndScroll == NULL) {
@@ -745 +746 @@
    }
 
-   if(fShow != WinIsWindowVisible(hwndScroll))
+   if(fShow != WinIsWindowVisible(hwndScroll) || fForceChange)
    {
          WinSetParent(hwndScroll, fShow ? hwndParent : HWND_OBJECT, FALSE);

trunk/src/user32/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.13 1999-10-11 16:04:51 cbratschi Exp $ */
+/* $Id: oslibwin.h,v 1.14 1999-10-12 18:14:56 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -260 +260 @@
 #define OSLIB_VSCROLL   1
 BOOL  OSLibWinEnableScrollBar(HWND hwndParent, int scrollBar, BOOL fEnable);
-BOOL  OSLibWinShowScrollBar(HWND hwndParent, HWND hwndScroll, int scrollBar, BOOL fShow);
+BOOL  OSLibWinShowScrollBar(HWND hwndParent, HWND hwndScroll, int scrollBar, BOOL fShow, BOOL fForceChange = FALSE);
 HWND  OSLibWinQueryScrollBarHandle(HWND hwndParent, int scrollBar);
 ULONG OSLibWinGetScrollPos(HWND hwndParent, HWND hwndScroll);

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.37 1999-10-12 14:47:23 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.38 1999-10-12 18:14:56 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -510 +510 @@
   {
         hwndHorzScroll = OSLibWinQueryScrollBarHandle(OS2HwndFrame, OSLIB_HSCROLL);
+        OSLibWinShowScrollBar(OS2HwndFrame, hwndHorzScroll, OSLIB_HSCROLL, FALSE, TRUE);
   }
 
   if (cs->style & WS_VSCROLL) {
         hwndVertScroll = OSLibWinQueryScrollBarHandle(OS2HwndFrame, OSLIB_VSCROLL);
+        OSLibWinShowScrollBar(OS2HwndFrame, hwndVertScroll, OSLIB_VSCROLL, FALSE, TRUE);
   }
 
@@ -1424 +1426 @@
             {
                 new_flags = ESB_DISABLE_BOTH;
-                //TODO:
+//               *action |= SA_SSI_REFRESH;
             }
             else if (nBar != SB_CTL)
             {
-                //TODO
+//                *action = SA_SSI_HIDE;
                 goto done;
             }
@@ -1434 +1436 @@
         else  /* Show and enable scroll-bar */
         {
-            //TODO
             new_flags = 0;
+//            if (nBar != SB_CTL)
+//                *action |= SA_SSI_SHOW;
         }