Changeset 8515 for trunk/src

Timestamp:

May 29, 2002, 4:05:10 PM (23 years ago)

Author:

sandervl

Message:

Update: Wine merged our changes

File:

• trunk/src/comctl32/propsheet.c (modified) (17 diffs)

trunk/src/comctl32/propsheet.c

@@ -33 +33 @@
 #include "heap.h"
 
-#ifdef __WIN32OS2__
-#include <heapstring.h>
-#endif
 
 /******************************************************************************
@@ -212 +209 @@
 #undef add_flag
 
-#ifdef __WIN32OS2__
 /******************************************************************************
  *            PROPSHEET_FindPageByResId
@@ -233 +229 @@
    return i;
 }
-#endif
 
 /******************************************************************************
@@ -489 +484 @@
       pTitle = lppsp->pszTitle;
 
-    len = strlenW(szTitle);
+    len = strlenW(pTitle);
     psInfo->proppage[index].pszText = COMCTL32_Alloc( (len+1)*sizeof (WCHAR) );
     strcpyW( (LPWSTR)psInfo->proppage[index].pszText,pTitle);
@@ -1164 +1159 @@
   TRACE("index %d\n", index);
 
-#ifdef __WIN32OS2__
   if (ppshpage == NULL)
   {
-    dprintf(("COMCTL32:PROPSHEET_CreatePage: ERROR!!! ppshpage == NULL!!!\n"));
     return FALSE;
   }
-#endif
 
   if (ppshpage->dwFlags & PSP_DLGINDIRECT)
@@ -1212 +1204 @@
     ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_DISABLED;
     ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_VISIBLE;
-#ifdef __WIN32OS2__
     ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_THICKFRAME;
-#endif
   }
   else
@@ -1225 +1215 @@
     pTemplate->style &= ~WS_DISABLED;
     pTemplate->style &= ~WS_VISIBLE;
-#ifdef __WIN32OS2__
     pTemplate->style &= ~WS_THICKFRAME;
-#endif
   }
 
@@ -1269 +1257 @@
   }
 
-#ifdef __WIN32OS2__
-  //HACK alert!
-  //SvL: CVP multiplies y padding by two to calculate the new height
-  //I have no idea if this is always correct
-  //This actually does make sense. The property page will get centered instead
-  //of being slammed in the lower right corner
   SetWindowPos(hwndPage, HWND_TOP,
                rc.left + padding.x/2,
                rc.top + padding.y/2,
                pageWidth, pageHeight, 0);
-#else
-  SetWindowPos(hwndPage, HWND_TOP,
-               rc.left + padding.x,
-               rc.top + padding.y,
-               pageWidth, pageHeight, 0);
-#endif
 
   return TRUE;
@@ -1335 +1311 @@
 static BOOL PROPSHEET_Back(HWND hwndDlg)
 {
-  BOOL res;
   PSHNOTIFY psn;
   HWND hwndPage;
@@ -1341 +1316 @@
                                                     PropSheetInfoStr);
   LRESULT result;
-#ifdef __WIN32OS2__
   int idx;
-#endif
 
   TRACE("active_page %d\n", psInfo->active_page);
@@ -1359 +1332 @@
   if (result == -1)
     return FALSE;
-#ifdef __WIN32OS2__
   else if (result == 0)
      idx = psInfo->active_page - 1;
@@ -1370 +1342 @@
         PROPSHEET_SetCurSel(hwndDlg, idx, -1, 0);
   }
-#else
-  if (psInfo->active_page > 0)
-  {
-     res = PROPSHEET_CanSetCurSel(hwndDlg);
-     if(res != FALSE)
-     {
-       res = PROPSHEET_SetCurSel(hwndDlg, psInfo->active_page - 1, -1, 0);
-     }
-  }
-#endif
   return TRUE;
 }
@@ -1393 +1355 @@
   PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwndDlg,
                                                     PropSheetInfoStr);
-#ifdef __WIN32OS2__
   int idx;
-#endif
 
   TRACE("active_page %d\n", psInfo->active_page);
@@ -1411 +1371 @@
   if (msgResult == -1)
     return FALSE;
-#ifdef __WIN32OS2__
   else if (msgResult == 0)
      idx = psInfo->active_page + 1;
@@ -1422 +1381 @@
         PROPSHEET_SetCurSel(hwndDlg, idx, 1, 0);
   }
-#else
-  if(PROPSHEET_CanSetCurSel(hwndDlg) != FALSE)
-  {
-    PROPSHEET_SetCurSel(hwndDlg, psInfo->active_page + 1, 1, 0);
-  }
-#endif
 
   return TRUE;
@@ -1799 +1752 @@
       }
     }
-#ifdef __WIN32OS2__
     else if (result != 0)
     {
@@ -1805 +1757 @@
        continue;
     }
-#endif
   }
   /*