Changeset 3154 for trunk/src/comctl32/tab.cpp

Timestamp:

Mar 18, 2000, 5:17:35 PM (25 years ago)

Author:

cbratschi

Message:

Corel 20000317 merge, ccbase finished, bug fixes

File:

• trunk/src/comctl32/tab.cpp (modified) (23 diffs)

trunk/src/comctl32/tab.cpp

@@ -1 @@
-/* $Id: tab.cpp,v 1.1 2000-02-23 17:09:48 cbratschi Exp $ */
+/* $Id: tab.cpp,v 1.2 2000-03-18 16:17:30 cbratschi Exp $ */
 /*
  * Tab control
@@ -16 +16 @@
 
 /* inconsistent: report! */
-/* WINE 991212 level */
+/*
+ - Corel WINE 20000317 level
+ - (WINE 991212 level)
+*/
 
 #include <string.h>
@@ -22 +25 @@
 #include "winbase.h"
 #include "commctrl.h"
+#include "ccbase.h"
 #include "tab.h"
 #include "comctl32.h"
@@ -42 +46 @@
 #define DEFAULT_TAB_WIDTH       96
 
-#define TAB_GetInfoPtr(hwnd) ((TAB_INFO *)GetWindowLongA(hwnd,0))
+#define TAB_GetInfoPtr(hwnd) ((TAB_INFO*)getInfoPtr(hwnd))
 
 /******************************************************************************
@@ -50 +54 @@
 static void TAB_InvalidateTabArea(HWND      hwnd, TAB_INFO* infoPtr);
 static void TAB_EnsureSelectionVisible(HWND hwnd, TAB_INFO* infoPtr);
-
-static BOOL
-TAB_SendSimpleNotify (HWND hwnd, UINT code)
-{
-    NMHDR nmhdr;
-
-    nmhdr.hwndFrom = hwnd;
-    nmhdr.idFrom = GetWindowLongA(hwnd, GWL_ID);
-    nmhdr.code = code;
-
-    return (BOOL) SendMessageA (GetParent (hwnd), WM_NOTIFY,
-            (WPARAM) nmhdr.idFrom, (LPARAM) &nmhdr);
-}
-
 
 static VOID
@@ -82 +72 @@
 }
 
-
-
 static LRESULT
 TAB_GetCurSel (HWND hwnd)
@@ -140 +128 @@
   } else {
     if (infoPtr->iSelected != iItem) {
-      if (TAB_SendSimpleNotify(hwnd, TCN_SELCHANGING)!=TRUE)  {
+      if (sendNotify(hwnd,TCN_SELCHANGING) != TRUE)  {
         infoPtr->iSelected = iItem;
-        TAB_SendSimpleNotify(hwnd, TCN_SELCHANGE);
+        sendNotify(hwnd,TCN_SELCHANGE);
 
         TAB_EnsureSelectionVisible(hwnd, infoPtr);
@@ -282 +270 @@
        (infoPtr->uFocus != newItem) )
   {
-    if (!TAB_SendSimpleNotify(hwnd, TCN_SELCHANGING))
+    if (!sendNotify(hwnd,TCN_SELCHANGING))
     {
       infoPtr->iSelected = newItem;
       infoPtr->uFocus    = newItem;
-      TAB_SendSimpleNotify(hwnd, TCN_SELCHANGE);
+      sendNotify(hwnd,TCN_SELCHANGE);
 
       TAB_EnsureSelectionVisible(hwnd, infoPtr);
@@ -404 +392 @@
        (infoPtr->iSelected != newItem) )
   {
-    if (TAB_SendSimpleNotify(hwnd, TCN_SELCHANGING)!=TRUE)
+    if (sendNotify(hwnd,TCN_SELCHANGING) != TRUE)
     {
       infoPtr->iSelected = newItem;
       infoPtr->uFocus    = newItem;
-      TAB_SendSimpleNotify(hwnd, TCN_SELCHANGE);
+      sendNotify(hwnd, TCN_SELCHANGE);
 
       TAB_EnsureSelectionVisible(hwnd, infoPtr);
@@ -440 +428 @@
        (infoPtr->iSelected != newItem) )
   {
-    if (TAB_SendSimpleNotify(hwnd, TCN_SELCHANGING)!=TRUE)
+    if (sendNotify(hwnd,TCN_SELCHANGING) != TRUE)
     {
       infoPtr->iSelected = newItem;
       infoPtr->uFocus    = newItem;
-      TAB_SendSimpleNotify(hwnd, TCN_SELCHANGE);
+      sendNotify(hwnd,TCN_SELCHANGE);
 
       TAB_EnsureSelectionVisible(hwnd, infoPtr);
@@ -451 +439 @@
     }
   }
-  TAB_SendSimpleNotify(hwnd, NM_CLICK);
+  sendNotify(hwnd,NM_CLICK);
 
   return 0;
@@ -459 +447 @@
 TAB_RButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-  TAB_SendSimpleNotify(hwnd, NM_RCLICK);
+  sendNotify(hwnd,NM_RCLICK);
+
   return 0;
 }
@@ -805 +794 @@
                              clientRect.right);
 
+  /* Don't need scrolling, then update infoPtr->leftmostVisible */
+  if(!infoPtr->needsScrolling)
+    infoPtr->leftmostVisible = 0;
+
   TAB_SetupScrolling(hwnd, infoPtr, &clientRect);
 
@@ -1379 +1372 @@
     infoPtr->items[iItem].lParam = pti->lParam;
 
+  TAB_SetItemBounds(hwnd);
   TAB_InvalidateTabArea(hwnd, infoPtr);
 
@@ -1384 +1378 @@
 //      hwnd, iItem, infoPtr->items[iItem].pszText);
 
-  TAB_SetItemBounds(hwnd);
   return iItem;
 }
@@ -1446 +1439 @@
     infoPtr->items[iItem].lParam = pti->lParam;
 
+  TAB_SetItemBounds(hwnd);
   TAB_InvalidateTabArea(hwnd, infoPtr);
 
@@ -1451 +1445 @@
 //      hwnd, iItem, infoPtr->items[iItem].pszText);
 
-  TAB_SetItemBounds(hwnd);
   return iItem;
 }
@@ -1783 +1776 @@
   HDC hdc;
   HFONT hOldFont;
-
-  infoPtr = (TAB_INFO *)COMCTL32_Alloc (sizeof(TAB_INFO));
-
-  SetWindowLongA(hwnd, 0, (DWORD)infoPtr);
+  DWORD dwStyle;
+
+  infoPtr = (TAB_INFO*)initControl(hwnd,sizeof(TAB_INFO));
 
   infoPtr->uNumItem        = 0;
@@ -1800 +1792 @@
   infoPtr->leftmostVisible = 0;
 
-//  TRACE(tab, "Created tab control, hwnd [%04x]\n", hwnd);
-  if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_TOOLTIPS) {
-    /* Create tooltip control */
-    infoPtr->hwndToolTip =
-      CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
-                       CW_USEDEFAULT, CW_USEDEFAULT,
-                       CW_USEDEFAULT, CW_USEDEFAULT,
-                       hwnd, 0, 0, 0);
-
-    /* Send NM_TOOLTIPSCREATED notification */
-    if (infoPtr->hwndToolTip) {
-      NMTOOLTIPSCREATED nmttc;
-
-      nmttc.hdr.hwndFrom = hwnd;
-      nmttc.hdr.idFrom = GetWindowLongA(hwnd, GWL_ID);
-      nmttc.hdr.code = NM_TOOLTIPSCREATED;
-      nmttc.hwndToolTips = infoPtr->hwndToolTip;
-
-      SendMessageA (GetParent (hwnd), WM_NOTIFY,
-                    (WPARAM)GetWindowLongA(hwnd, GWL_ID), (LPARAM)&nmttc);
-    }
-  }
+  /* The tab control always has the WS_CLIPSIBLINGS style. Even
+     if you don't specify in CreateWindow. This is necesary in
+     order for paint to work correctly. This follows windows behaviour. */
+  dwStyle = GetWindowLongA(hwnd, GWL_STYLE);
+  SetWindowLongA(hwnd, GWL_STYLE, dwStyle|WS_CLIPSIBLINGS);
+
+
+  /* Create tooltip control */
+  if (dwStyle & TCS_TOOLTIPS)
+    infoPtr->hwndToolTip = createToolTip(hwnd,0,FALSE);
 
   /*
@@ -1873 +1853 @@
     DestroyWindow(infoPtr->hwndUpDown);
 
-  COMCTL32_Free (infoPtr);
+  doneControl(hwnd);
+
   return 0;
 }
@@ -2044 +2025 @@
 //      ERR (tab, "unknown msg %04x wp=%08x lp=%08lx\n",
 //           uMsg, wParam, lParam);
-      return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+      return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
     }
 
@@ -2055 +2036 @@
 {
   WNDCLASSA wndClass;
-
-//SvL: Don't check this now
-//  if (GlobalFindAtomA (WC_TABCONTROLA)) return;
 
   ZeroMemory (&wndClass, sizeof(WNDCLASSA));
@@ -2075 +2053 @@
 TAB_Unregister (VOID)
 {
-  if (GlobalFindAtomA (WC_TABCONTROLA))
-    UnregisterClassA (WC_TABCONTROLA, (HINSTANCE)NULL);
-}
-
+  UnregisterClassA (WC_TABCONTROLA, (HINSTANCE)NULL);
+}
+