Changeset 1333 for trunk/src/user32/listbox.cpp

Timestamp:

Oct 17, 1999, 2:17:46 PM (26 years ago)

Author:

cbratschi

Message:

added WINE scrollbars to frame, fixed pmframe, WM_ENTERIDLE

File:

• trunk/src/user32/listbox.cpp (modified) (9 diffs)

trunk/src/user32/listbox.cpp

@@ -1 @@
-/* $Id: listbox.cpp,v 1.6 1999-10-14 18:27:55 sandervl Exp $ */
+/* $Id: listbox.cpp,v 1.7 1999-10-17 12:17:42 cbratschi Exp $ */
 /*
  * Listbox controls
@@ -24 +24 @@
  * - Unicode
  * - Locale handling
- CB:
-  - KillSystemTimer, SetSystemTimer
  */
 
@@ -201 +199 @@
     else
     {
-        info.nPos  = descr->top_item;
+        info.nPos  = descr->top_item;
 
         info.nPage = LISTBOX_GetCurrentPageSize( hwnd, descr );
@@ -212 +210 @@
             info.fMask |= SIF_DISABLENOSCROLL;
 
-        if(info.nMax > (INT)info.nPage) {
-            ShowScrollBar(hwnd, SB_VERT, TRUE);
-            EnableScrollBar(hwnd, SB_VERT, ESB_ENABLE_BOTH);            
+        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);           
-        }
+        }
+        else {
+            ShowScrollBar(hwnd, SB_VERT, FALSE);
+            EnableScrollBar(hwnd, SB_VERT, ESB_DISABLE_BOTH);
+        }
 
         if (descr->horz_extent)
@@ -1902 +1900 @@
 static LRESULT LISTBOX_HandleLButtonUp( HWND hwnd, LB_DESCR *descr )
 {
-/* CB: implement!
     if (LISTBOX_Timer != LB_TIMER_NONE)
         KillSystemTimer( hwnd, LB_TIMER_ID );
-*/
+
     LISTBOX_Timer = LB_TIMER_NONE;
     if (descr->captured)
@@ -1963 +1960 @@
     if (!LISTBOX_HandleTimer( hwnd, descr, descr->focus_item, LISTBOX_Timer ))
     {
-/* CB: implement!
         KillSystemTimer( hwnd, LB_TIMER_ID );
-*/
+
         LISTBOX_Timer = LB_TIMER_NONE;
     }
@@ -2016 +2012 @@
     /* Start/stop the system timer */
 
-/* CB: implement!
     if (dir != LB_TIMER_NONE)
         SetSystemTimer( hwnd, LB_TIMER_ID, LB_SCROLL_TIMEOUT, NULL);
-*/
-/* CB: implement!
     else if (LISTBOX_Timer != LB_TIMER_NONE)
         KillSystemTimer( hwnd, LB_TIMER_ID );
-*/
+
     LISTBOX_Timer = dir;
 }
@@ -2566 +2559 @@
             LISTBOX_HandleMouseMove( hwnd, descr, (INT16)LOWORD(lParam),
                                      (INT16)HIWORD(lParam) );
-        return 1; //SvL: Bugfix -> PMWINDOW expects non-zero return value if
+        return 1; //SvL: Bugfix -> PMWINDOW expects non-zero return value if
                   //               we want to restore the default mouse cursor
 
@@ -2678 +2671 @@
 
                    GetClientRect(hwnd, &clientRect);
-                   if (PtInRect( &clientRect, mousePos ))
-                   {
-                       captured = descr->captured;
-                       descr->captured = TRUE;                  
-                
-                       LISTBOX_HandleMouseMove( hwnd, descr,
-                                                    mousePos.x, mousePos.y);
+                   if (PtInRect( &clientRect, mousePos ))
+                   {
+                       captured = descr->captured;
+                       descr->captured = TRUE;
+
+                       LISTBOX_HandleMouseMove( hwnd, descr,
+                                                    mousePos.x, mousePos.y);
                        descr->captured = captured;
                    }
                    else
                    {
-                       LISTBOX_HandleMouseMove( hwnd, descr,
-                                                    mousePos.x, mousePos.y);
+                       LISTBOX_HandleMouseMove( hwnd, descr,
+                                                    mousePos.x, mousePos.y);
                    }