Changeset 25 for trunk/include/helpers/winh.h

Timestamp:

Jan 17, 2001, 6:34:55 PM (25 years ago)

Author:

umoeller

Message:

Misc. changes for V0.9.7.

File:

• trunk/include/helpers/winh.h (modified) (11 diffs)

trunk/include/helpers/winh.h

@@ -129 +129 @@
                                       SHORT iPosition,
                                       SHORT sItemId,
-                                      PSZ pszItemTitle,
+                                      const char *pcszItemTitle,
                                       SHORT afStyle,
                                       SHORT afAttr);
@@ -136 +136 @@
                                     ULONG iPosition,
                                     SHORT sMenuId,
-                                    PSZ pszSubmenuTitle,
+                                    const char *pcszSubmenuTitle,
                                     USHORT afMenuStyle,
                                     SHORT sItemId,
-                                    PSZ pszItemTitle,
+                                    const char *pcszItemTitle,
                                     USHORT afItemStyle,
                                     USHORT afAttribute);
@@ -469 +469 @@
     BOOL XWPENTRY winhHandleScrollMsg(HWND hwnd2Scroll,
                                       HWND hwndScrollBar,
-                                      PLONG plCurUnitOfs,
+                                      PULONG pulCurPelsOfs,
                                       PRECTL prcl2Scroll,
                                       LONG ulViewportPels,
@@ -490 +490 @@
      ********************************************************************/
 
-    BOOL XWPENTRY winhSaveWindowPos(HWND hwnd, HINI hIni, PSZ pszApp, PSZ pszKey);
-
-    BOOL XWPENTRY winhRestoreWindowPos(HWND hwnd, HINI hIni, PSZ pszApp, PSZ pszKey, ULONG fl);
+    BOOL XWPENTRY winhSaveWindowPos(HWND hwnd, HINI hIni, const char *pcszApp, const char *pcszKey);
+
+    BOOL XWPENTRY winhRestoreWindowPos(HWND hwnd, HINI hIni, const char *pcszApp, const char *pcszKey, ULONG fl);
 
     #define XAC_MOVEX       0x0001
@@ -571 +571 @@
     #ifdef INCL_WINHELP
         HWND XWPENTRY winhCreateHelp(HWND hwndFrame,
-                                     PSZ pszFileName,
+                                     const char *pcszFileName,
                                      HMODULE hmod,
                                      PHELPTABLE pHelpTable,
-                                     PSZ pszWindowTitle);
+                                     const char *pcszWindowTitle);
 
         void XWPENTRY winhDestroyHelp(HWND hwndHelp, HWND hwndFrame);
@@ -589 +589 @@
     #endif
 
-    BOOL XWPENTRY winhAnotherInstance(PSZ pszSemName, BOOL fSwitch);
+    BOOL XWPENTRY winhAnotherInstance(const char *pcszSemName, BOOL fSwitch);
 
     HSWITCH XWPENTRY winhAddToTasklist(HWND hwnd, HPOINTER hIcon);
@@ -613 +613 @@
                               ULONG flFlags,
                               HINI hini,
-                              PSZ pszApplication,
-                              PSZ pszKey);
+                              const char *pcszApplication,
+                              const char *pcszKey);
 
     HPOINTER XWPENTRY winhSetWaitPointer(VOID);
@@ -629 +629 @@
 
     BOOL XWPENTRY winhReplaceWindowText(HWND hwnd,
-                                        PSZ pszSearch,
-                                        PSZ pszReplaceWith);
+                                        const char *pcszSearch,
+                                        const char *pcszReplaceWith);
 
     ULONG XWPENTRY winhCenteredDlgBox(HWND hwndParent, HWND hwndOwner,
@@ -647 +647 @@
                                       ULONG flFrameCreateFlags,
                                       ULONG ulFrameStyle,
-                                      PSZ pszFrameTitle,
+                                      const char *pcszFrameTitle,
                                       ULONG ulResourcesID,
-                                      PSZ pszClassClient,
+                                      const char *pcszClassClient,
                                       ULONG flStyleClient,
                                       ULONG ulID,
@@ -655 +655 @@
                                       PHWND phwndClient);
 
-    /*
-     *@@ winhCreateObjectWindow:
-     *      creates an object window of the specified
-     *      window class, which you should have registered
-     *      before calling this. pvCreateParam will be
-     *      given to the window on WM_CREATE.
-     *
-     *      Returns the HWND of the object window or
-     *      NULLHANDLE on errors.
-     *
-     *@@added V0.9.3 (2000-04-17) [umoeller]
-     */
-
-    #define winhCreateObjectWindow(pcszWindowClass, pvCreateParam) \
-                WinCreateWindow(HWND_OBJECT, pcszWindowClass,   \
-                    (PSZ)"", 0, 0,0,0,0, 0, HWND_BOTTOM, 0, pvCreateParam, NULL)
+    HWND winhCreateObjectWindow(const char *pcszWindowClass,
+                                PVOID pvCreateParam);
 
     VOID XWPENTRY winhRepaintWindows(HWND hwndParent);
@@ -684 +670 @@
                                  ULONG ulDownUnits);
 
-    ULONG XWPENTRY winhDrawFormattedText(HPS hps, PRECTL prcl, PSZ pszText, ULONG flCmd);
+    ULONG XWPENTRY winhDrawFormattedText(HPS hps, PRECTL prcl, const char *pcszText, ULONG flCmd);
 
     #ifdef INCL_WINSWITCHLIST