Changeset 156

Timestamp:

Apr 18, 2002, 9:53:28 PM (23 years ago)

Author:

umoeller

Message:

Misc fixes.

Location:

trunk

Files:

• include/encodings/base.h (modified) (1 diff)
• include/helpers/dialog.h (modified) (1 diff)
• include/helpers/winh.h (modified) (1 diff)
• src/helpers/dialog.c (modified) (2 diffs)
• src/helpers/encodings.c (modified) (3 diffs)
• src/helpers/winh.c (modified) (1 diff)

trunk/include/encodings/base.h

@@ -113 +113 @@
     } ENCBYTECOUNT;
 
+    int encGetTable(ENCID id,
+                    PXWPENCODINGMAP *ppMap,
+                    unsigned long *pcEntries);
+
     ENCID encFindIdForCodepage(unsigned short usCodepage,
-                                       const char **ppcszDescription,
-                                       ENCBYTECOUNT *pByteCount);
+                               const char **ppcszDescription,
+                               ENCBYTECOUNT *pByteCount);
 
     PCONVERSION encCreateCodec(ENCID id);

trunk/include/helpers/dialog.h

@@ -312 +312 @@
             id, CTL_COMMON_FONT, 0, {cx, cy}, COMMON_SPACING }
 
+    // the following require INCL_WINSTDSLIDER
+
+    #define CONTROLDEF_SLIDER(id, cx, cy, pctldata) { WC_SLIDER, NULL, \
+            WS_VISIBLE | WS_TABSTOP | WS_GROUP | SLS_HORIZONTAL | SLS_PRIMARYSCALE1 \
+            | SLS_BUTTONSRIGHT | SLS_SNAPTOINCREMENT, \
+            id, CTL_COMMON_FONT, 0, {cx, cy}, COMMON_SPACING, pctldata }
+
     /* ******************************************************************
      *

trunk/include/helpers/winh.h

@@ -837 +837 @@
         typedef PSWBLOCK XWPENTRY WINHQUERYSWITCHLIST(HAB hab);
         typedef WINHQUERYSWITCHLIST *PWINHQUERYSWITCHLIST;
+
+        HSWITCH XWPENTRY winhHSWITCHfromHAPP(HAPP happ);
     #endif
 

trunk/src/helpers/dialog.c

@@ -475 +475 @@
  *@@changed V0.9.16 (2001-10-15) [umoeller]: added APIRET
  *@@changed V0.9.16 (2002-02-02) [umoeller]: added support for explicit group size
+ *@@changed V0.9.19 (2002-04-17) [umoeller]: fixes for the STUPID drop-down comboboxes
  */
 
@@ -714 +715 @@
  *@@changed V0.9.16 (2001-10-15) [umoeller]: fixed ugly group table spacings
  *@@changed V0.9.16 (2001-12-08) [umoeller]: fixed entry field ES_MARGIN positioning
+ *@@changed V0.9.19 (2002-04-17) [umoeller]: fixes for the STUPID drop-down comboboxes
  */
 

trunk/src/helpers/encodings.c

@@ -126 +126 @@
 
 /*
- *@@ FindEntry:
+ *@@ encGetTable:
  *
  *@@added V0.9.18 (2002-03-08) [umoeller]
  */
 
-static int FindEntry(ENCID id,
-                     PXWPENCODINGMAP *ppMap,
-                     unsigned long *pcEntries)
+int encGetTable(ENCID id,
+                PXWPENCODINGMAP *ppMap,
+                unsigned long *pcEntries)
 {
     unsigned long ul;
@@ -161 +161 @@
 ENCID encFindIdForCodepage(unsigned short usCodepage,       // in: codepage to find
                            const char **ppcszDescription,   // out: codepage description; ptr can be NULL
-                           ENCBYTECOUNT *pByteCount)        // out: SINGLE or DOUBLE
+                           ENCBYTECOUNT *pByteCount)        // out: SINGLE or DOUBLE; ptr can be NULL
 {
     unsigned long ul;
@@ -246 +246 @@
     unsigned long cArrayEntries;
 
-    if (FindEntry(id,
-                  &pEncodingMap,
-                  &cArrayEntries))
+    if (encGetTable(id,
+                    &pEncodingMap,
+                    &cArrayEntries))
     {
         unsigned short usHighestCP = 0,

trunk/src/helpers/winh.c

@@ -4252 +4252 @@
 }
 
+typedef HSWITCH APIENTRY WINHSWITCHFROMHAPP(HAPP happ);
+
+/*
+ *@@ winhHSWITCHfromHAPP:
+ *      resolves and calls the undocumented
+ *      WinHSWITCHfromHAPP API.
+ *
+ *@@added V0.9.19 (2002-04-17) [umoeller]
+ */
+
+HSWITCH winhHSWITCHfromHAPP(HAPP happ)
+{
+    static WINHSWITCHFROMHAPP *pWinHSWITCHfromHAPP = NULL;
+
+    if (!pWinHSWITCHfromHAPP)
+        // first call: import WinHSWITCHfromHAPP
+        // WinHSWITCHfromHAPP PMMERGE.5199
+        doshQueryProcAddr("PMMERGE",
+                          5199,
+                          (PFN*)&pWinHSWITCHfromHAPP);
+
+    if (pWinHSWITCHfromHAPP)
+        return pWinHSWITCHfromHAPP(happ);
+
+    return NULLHANDLE;
+}
+
 /*
  *@@ winhQueryTasklistWindow: