Changeset 21990 for trunk/src

Timestamp:

Apr 2, 2012, 6:39:34 PM (13 years ago)

Author:

dmik

Message:

Make About Odin system menu item localizable.

Location:

trunk/src/user32

Files:

• menu.c (modified) (3 diffs)
• resources/user32_En.orc (modified) (1 diff)
• resources/user32_Ru.orc (modified) (1 diff)
• user32rsrc.orc (modified) (1 diff)

trunk/src/user32/menu.c

@@ -45 +45 @@
 #include "oslibwin.h"
 #include "heapstring.h"
+
+#include "user32rsrcdef.h"
 
 
@@ -347 +349 @@
 static HMENU MENU_CopySysPopup(void)
 {
+    HMODULE hmod = GetModuleHandleA("USER32");
+
 #ifndef __WIN32OS2__
-    HMENU hMenu = LoadMenuA(GetModuleHandleA("USER32"), "SYSMENU");
+    HMENU hMenu = LoadMenuA(hmod, "SYSMENU");
 #else
-    HMENU hMenu;
-    hMenu = LoadMenuA(GetModuleHandleA("USER32"), fOS2Look ? "SYSMENUWARP" : "SYSMENU");
+    HMENU hMenu = LoadMenuA(hmod, fOS2Look ? "SYSMENUWARP" : "SYSMENU");
 #endif
 
@@ -360 +363 @@
 #ifdef __WIN32OS2__
         if(!fDisableOdinSysMenuItems) {
+            CHAR szTmp[256];
+            LoadStringA(hmod, IDS_ABOUTODIN, szTmp, sizeof(szTmp)/sizeof(szTmp[0]));
             AppendMenuA(hMenu, MF_SEPARATOR, 0, NULL);
             AppendMenuA(hMenu,MF_STRING,
-                       SC_ABOUTODIN, (LPSTR)"About Odin");
+                       SC_ABOUTODIN, szTmp);
 #ifdef DEBUG
             AppendMenuA(hMenu, MF_SEPARATOR, 0, NULL);

trunk/src/user32/resources/user32_En.orc

@@ -69 +69 @@
 STRINGTABLE DISCARDABLE 
 { 
+    IDS_ABOUTODIN  "About Odin"
+
     MDI_IDS_MOREWINDOWS  "&More Windows..." /* defined in mdi.h */
 }

trunk/src/user32/resources/user32_Ru.orc

@@ -56 +56 @@
 END
 
+STRINGTABLE DISCARDABLE 
+{ 
+    IDS_ABOUTODIN  "Î Odin"
+
+    MDI_IDS_MOREWINDOWS  "&Åùå îêíà..." /* defined in mdi.h */
+}

trunk/src/user32/user32rsrc.orc

@@ -6 +6 @@
 #include "odinrsrc.h"
 #include "mdi.h"
+#include "user32rsrcdef.h"
 
 /* Frame */