Changeset 1776 for trunk/src

Timestamp:

Nov 19, 1999, 5:22:01 PM (26 years ago)

Author:

achimha

Message:

comctl32 wine 991114 merge

Location:

trunk/src/comctl32

Files:

• propsheet.c (modified) (15 diffs)
• toolbar.c (modified) (3 diffs)
• treeview.c (modified) (4 diffs)

trunk/src/comctl32/propsheet.c

@@ -1 @@
-/* $Id: propsheet.c,v 1.13 1999-11-14 10:58:38 achimha Exp $ */
+/* $Id: propsheet.c,v 1.14 1999-11-19 16:16:38 achimha Exp $ */
 /*
  * Property Sheets
@@ -13 +13 @@
  */
 
-/* WINE 991031 level */
+/* WINE 991114 level */
 
 /* CB: Odin problems:
@@ -1015 +1015 @@
                                                     PropSheetInfoStr);
 
+  if (psInfo->active_page <= 0)
+     return FALSE;
+
+  hdr.hwndFrom = hwndDlg;
   hdr.code = PSN_WIZBACK;
 
@@ -1022 +1026 @@
     return FALSE;
 
-  res = PROPSHEET_SetCurSel(hwndDlg, psInfo->active_page - 1, 0);
+  res = PROPSHEET_CanSetCurSel(hwndDlg);
+  if(res != FALSE)
+  {
+    res = PROPSHEET_SetCurSel(hwndDlg, psInfo->active_page - 1, 0);
+  }
 
   /* if we went to page 0, disable Back button */
@@ -1042 +1050 @@
                                                     PropSheetInfoStr);
 
+  if (psInfo->active_page < 0 || psInfo->active_page == psInfo->nPages - 1)
+     return FALSE;
+
   hdr.hwndFrom = hwndDlg;
   hdr.code = PSN_WIZNEXT;
@@ -1072 +1083 @@
   PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwndDlg,
                                                     PropSheetInfoStr);
+
+  if (psInfo->active_page < 0)
+     return FALSE;
 
   hdr.hwndFrom = hwndDlg;
@@ -1105 +1119 @@
                                                     PropSheetInfoStr);
 
+  if (psInfo->active_page < 0)
+     return FALSE;
+
   hdr.hwndFrom = hwndDlg;
 
@@ -1141 +1158 @@
   PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwndDlg,
                                                     PropSheetInfoStr);
-  HWND hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
+  HWND hwndPage;
   NMHDR hdr;
 
+  if (psInfo->active_page < 0)
+     return;
+
+  hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
   hdr.hwndFrom = hwndDlg;
   hdr.code = PSN_QUERYCANCEL;
@@ -1167 +1188 @@
   PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwndDlg,
                                                     PropSheetInfoStr);
-  HWND hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
+  HWND hwndPage;
   NMHDR hdr;
 
+  if (psInfo->active_page < 0)
+     return;
+
+  hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
   hdr.hwndFrom = hwndDlg;
   hdr.code = PSN_HELP;
@@ -1288 +1313 @@
   NMHDR hdr;
 
-  if (!psInfo)
-    return FALSE;
-
+  if (!psInfo || psInfo->active_page < 0)
+     return FALSE;
   /*
    * Notify the current page.
@@ -1315 +1339 @@
   NMHDR hdr;
 
+  if (psInfo->active_page < 0)
+     return FALSE;
+
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
@@ -1322 +1349 @@
    */
   if (hpage != NULL)
-  {
     index = PROPSHEET_GetPageIndex(hpage, psInfo);
 
-    if (index == -1)
-    {
-      TRACE("Could not find page to remove!\n");
-      return FALSE;
-    }
+  if (index < 0 || index >= psInfo->nPages)
+  {
+    TRACE("Could not find page to select!\n");
+    return FALSE;
   }
 
@@ -1367 +1392 @@
 static void PROPSHEET_SetTitleA(HWND hwndDlg, DWORD dwStyle, LPCSTR lpszText)
 {
+  PropSheetInfo*        psInfo = (PropSheetInfo*) GetPropA(hwndDlg, PropSheetInfoStr);
+  char                          szTitle[256];
+
+  if (HIWORD(lpszText) == 0) {
+    if (!LoadStringA(psInfo->ppshheader->hInstance, 
+                     LOWORD(lpszText), szTitle, sizeof(szTitle)-1))
+      return;
+    lpszText = szTitle;
+  }
   if (dwStyle & PSH_PROPTITLE)
   {
-    PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwndDlg,
-                                                      PropSheetInfoStr);
     char* dest;
     int lentitle = strlen(lpszText);
@@ -1782 +1814 @@
       LPCPROPSHEETPAGEA ppshpage;
 
+      SetPropA(hwnd, PropSheetInfoStr, (HANDLE)psInfo);
+
       /*
        * Small icon in the title bar.
@@ -1846 +1880 @@
         SendMessageA(hwndTabCtrl, TCM_SETCURSEL, psInfo->active_page, 0);
 
-      SetPropA(hwnd, PropSheetInfoStr, (HANDLE)psInfo);
-
-
       if (!HIWORD(psInfo->ppshheader->pszCaption) &&
               psInfo->ppshheader->hInstance)

trunk/src/comctl32/toolbar.c

@@ -1 @@
-/* $Id: toolbar.c,v 1.17 1999-11-02 21:44:03 achimha Exp $ */
+/* $Id: toolbar.c,v 1.18 1999-11-19 16:19:22 achimha Exp $ */
 /*
  * Toolbar control
@@ -27 +27 @@
  */
 
-/* WINE 991031 level */
+/* WINE 991114 level */
 
 /* CB: Odin32/WINE bugs
@@ -4035 +4035 @@
             return TOOLBAR_IsButtonPressed (hwnd, wParam, lParam);
 
-/*      case TB_LOADIMAGES:                     */ /* 4.70 */
+      case TB_LOADIMAGES:                      /* 4.70 */
+//        FIXME("missing standard imagelists\n");
+        return 0;
 /*      case TB_MAPACCELERATORA:                */ /* 4.71 */
 /*      case TB_MAPACCELERATORW:                */ /* 4.71 */

trunk/src/comctl32/treeview.c

@@ -1 @@
-/* $Id: treeview.c,v 1.15 1999-11-09 17:09:27 cbratschi Exp $ */
+/* $Id: treeview.c,v 1.16 1999-11-19 16:22:01 achimha Exp $ */
 /* Treeview control
  *
@@ -42 +42 @@
  */
 
-/* WINE 991031 level */
+/* WINE 991114 level */
 
 #include <string.h>
@@ -927 +927 @@
    }
 
+  wineItem->mask |= tvItem->mask;
+
   return TRUE;
 }
@@ -2462 +2464 @@
   tvdi.item.lParam      = wineItem->lParam;
   tvdi.item.pszText = COMCTL32_Alloc (128*sizeof(char));
+  tvdi.item.cchTextMax = 128;
   buf = tvdi.item.pszText;