Changeset 275 for trunk/src/pe2lx/menu.cpp

Timestamp:

Jul 6, 1999, 10:50:12 AM (26 years ago)

Author:

sandervl

Message:

Edgar Buerkle's codepages changes

File:

• trunk/src/pe2lx/menu.cpp (modified) (11 diffs)

trunk/src/pe2lx/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.3 1999-06-10 17:08:54 phaller Exp $ */
+/* $Id: menu.cpp,v 1.4 1999-07-06 08:50:11 sandervl Exp $ */
 
 /*
@@ -14 +14 @@
 #define INCL_DOSPROCESS          /* DOS Process values       */
 #define INCL_DOSMISC             /* DOS Miscellanous values  */
+#define INCL_DOSNLS
 #define INCL_WIN
 #include <os2.h>
@@ -27 +28 @@
 #include "misc.h"
 
-static int  ProcessSubMenu(PopupMenuItem *popupitem, MT_OS2 *os2menu, MTI_OS2 *menuitem, int size);
-static int  ProcessMenuItem(NormalMenuItem *popupitem, MT_OS2 *os2menu, MTI_OS2 *menuitem, int size);
+static int  ProcessSubMenu(PopupMenuItem *popupitem, MT_OS2 *os2menu, MTI_OS2 *menuitem, int size, int cp);
+static int  ProcessMenuItem(NormalMenuItem *popupitem, MT_OS2 *os2menu, MTI_OS2 *menuitem, int size, int cp);
 static void menustrcpy(char *dest, char *src);
 //******************************************************************************
 //******************************************************************************
-void ShowMenu(int id, MenuHeader *menu, int size)
+void ShowMenu(int id, MenuHeader *menu, int size, int cp)
 {
   PopupMenuItem  *popupitem = (PopupMenuItem *)((char *)menu + sizeof(MenuHeader));
@@ -39 +40 @@
   MTI_OS2 *menuitem;
   int newsize;
+  ULONG   ulCpSize, ulCP;
 
   //First save original win32 resource
@@ -45 +47 @@
   os2menu           = (MT_OS2 *)malloc(size*4); //should always be sufficient
   os2menu->len      = sizeof(MT_OS2) - sizeof(MTI_OS2);
-  os2menu->codepage = 437;
+  if(cp == 0)
+    os2menu->codepage         = 437;
+  else
+  {
+    DosQueryCp(sizeof(ulCP), &ulCP, &ulCpSize);
+    os2menu->codepage = ulCP;
+  }
   os2menu->reserved = 4;
   os2menu->cMti     = 0;
@@ -53 +61 @@
     if(popupitem->fItemFlags & POPUP) {
         cout << "POPUP ";
-        newsize = ProcessSubMenu(popupitem, os2menu, menuitem, size);
-    }
-    else    newsize = ProcessMenuItem(normalitem, os2menu, menuitem, size);
+        newsize = ProcessSubMenu(popupitem, os2menu, menuitem, size, cp);
+    }
+    else    newsize = ProcessMenuItem(normalitem, os2menu, menuitem, size, cp);
 
     if(popupitem->fItemFlags & ENDMENU) break;
@@ -70 +78 @@
 //******************************************************************************
 //******************************************************************************
-static int ProcessSubMenu(PopupMenuItem *popupitem, MT_OS2 *os2menu, MTI_OS2 *menuitem, int size)
+static int ProcessSubMenu(PopupMenuItem *popupitem, MT_OS2 *os2menu, MTI_OS2 *menuitem, int size, int cp)
 {
 NormalMenuItem *normalitem;
@@ -119 +127 @@
   else {
     len = (UniStrlen(popupitem->szItemText)+1)*2;
-    cout << UnicodeToAscii(popupitem->szItemText) << endl;
-    menustrcpy(menuitem->c, UnicodeToAscii(popupitem->szItemText));
+    cout << UnicodeToAscii(popupitem->szItemText, cp) << endl;
+    menustrcpy(menuitem->c, UnicodeToAscii(popupitem->szItemText, cp));
   }
   os2menu->len += sizeof(MTI_OS2);
@@ -144 +152 @@
         if(normalitem->fItemFlags & POPUP) {
             cout << "POPUP ";
-            newsize = ProcessSubMenu((PopupMenuItem *)normalitem, submenu, menuitem, size);
+            newsize = ProcessSubMenu((PopupMenuItem *)normalitem, submenu, menuitem, size, cp);
         }
-        else    newsize = ProcessMenuItem(normalitem, submenu, menuitem, size);
+        else    newsize = ProcessMenuItem(normalitem, submenu, menuitem, size, cp);
 
                 menuitem = (MTI_OS2 *)((int)submenu + submenu->len);
@@ -161 +169 @@
 //******************************************************************************
 //******************************************************************************
-static int ProcessMenuItem(NormalMenuItem *normalitem, MT_OS2 *os2menu, MTI_OS2 *menuitem, int size)
+static int ProcessMenuItem(NormalMenuItem *normalitem, MT_OS2 *os2menu, MTI_OS2 *menuitem, int size, int cp)
 {
 WCHAR          *menustring;
@@ -226 +234 @@
     }
     else {
-        cout << UnicodeToAscii(normalitem->szItemText) << endl;
-        menustrcpy(menuitem->c, UnicodeToAscii(normalitem->szItemText));
+        cout << UnicodeToAscii(normalitem->szItemText, cp) << endl;
+        menustrcpy(menuitem->c, UnicodeToAscii(normalitem->szItemText, cp));
     }
   }