soc.2009.vulture: b20ea47e: Workaround for resource compilers that d...

gdick at soc.pidgin.im gdick at soc.pidgin.im
Fri Aug 7 11:50:36 EDT 2009


-----------------------------------------------------------------
Revision: b20ea47ecf7b999c03ed6aa291ff42936b9cffa3
Ancestor: 9892d1a88ce7efbe3ae647c50e8d5cedc885352f
Author: gdick at soc.pidgin.im
Date: 2009-08-07T15:42:55
Branch: im.pidgin.soc.2009.vulture
URL: http://d.pidgin.im/viewmtn/revision/info/b20ea47ecf7b999c03ed6aa291ff42936b9cffa3

Modified files:
        vulture/vulture-res.rc

ChangeLog: 

Workaround for resource compilers that don't support L-prefixed strings in
class names.

-------------- next part --------------
============================================================
--- vulture/vulture-res.rc	ea5601cdbbc1bae716cf63ab3acbaef7bfcded87
+++ vulture/vulture-res.rc	cb375035f182086454ae88f33f5094b3d1545e3a
@@ -8,6 +8,14 @@
 #include <richedit.h>
 
 
+// Workaround for compilers that don't support L-prefixed strings.
+#ifdef UNICODE
+#define VULTURE_RICHEDIT_CLASS "RichEdit20W"
+#else
+#define VULTURE_RICHEDIT_CLASS "RichEdit20A"
+#endif
+
+
 //
 // Menu resources
 //
@@ -126,7 +134,7 @@ FONT 8, "Ms Shell Dlg"
 {
     GROUPBOX        "Accounts", IDC_STATIC, 7, 5, 300, 230
     LTEXT           "The accounts currently configured are listed below. Use the checkboxes to enable or disable the accounts.", IDC_STATIC, 15, 15, 285, 20, SS_LEFT
-    CONTROL         "", IDC_LIST_ACCOUNTS, WC_LISTVIEW, WS_TABSTOP | WS_BORDER | LVS_ALIGNLEFT | LVS_REPORT, 15, 35, 285, 175
+    CONTROL         "", IDC_LIST_ACCOUNTS, "SysListView32", WS_TABSTOP | WS_BORDER | LVS_ALIGNLEFT | LVS_REPORT, 15, 35, 285, 175
     PUSHBUTTON      "&Add...", IDC_BTN_ACCOUNT_ADD, 140, 215, 50, 14, WS_DISABLED | BS_PUSHBUTTON
     PUSHBUTTON      "&Properties", IDC_BTN_ACCOUNT_PROPERTIES, 195, 215, 50, 14, WS_DISABLED | BS_PUSHBUTTON
     PUSHBUTTON      "&Delete", IDC_BTN_ACCOUNT_DELETE, 250, 215, 50, 14, WS_DISABLED | BS_PUSHBUTTON
@@ -198,7 +206,7 @@ FONT 8, "Ms Shell Dlg"
 STYLE DS_3DLOOK | DS_CENTER | DS_CONTROL | DS_SHELLFONT | WS_VISIBLE | WS_CHILDWINDOW
 FONT 8, "Ms Shell Dlg"
 {
-    CONTROL         "", IDC_TREE_BLIST, WC_TREEVIEW, WS_TABSTOP | WS_BORDER | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_SHOWSELALWAYS | TVS_INFOTIP | TVS_FULLROWSELECT | TVS_EDITLABELS, 5, 5, 175, 85
+    CONTROL         "", IDC_TREE_BLIST, "SysTreeView32", WS_TABSTOP | WS_BORDER | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_SHOWSELALWAYS | TVS_INFOTIP | TVS_FULLROWSELECT | TVS_EDITLABELS, 5, 5, 175, 85
 }
 
 
@@ -208,10 +216,10 @@ FONT 8, "Ms Shell Dlg"
 STYLE DS_3DLOOK | DS_CENTER | DS_SHELLFONT | WS_CHILDWINDOW | WS_DISABLED
 FONT 8, "Ms Shell Dlg"
 {
-    CONTROL         "", IDC_RICHEDIT_CONV, RICHEDIT_CLASS, WS_TABSTOP | WS_VSCROLL | WS_BORDER | ES_AUTOVSCROLL | ES_MULTILINE | ES_READONLY, 5, 35, 245, 180
-    CONTROL         "", IDC_RICHEDIT_INPUT, RICHEDIT_CLASS, WS_TABSTOP | WS_BORDER | ES_MULTILINE | ES_WANTRETURN, 5, 190, 245, 40
-    CONTROL         "", IDC_TREE_NAMES, WC_TREEVIEW, WS_TABSTOP | WS_BORDER | TVS_INFOTIP | TVS_NOHSCROLL | TVS_FULLROWSELECT, 255, 35, 65, 225
-    CONTROL         "", IDC_STATIC_ICON, WC_STATIC, SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 5, 5, 25, 21
+    CONTROL         "", IDC_RICHEDIT_CONV, VULTURE_RICHEDIT_CLASS, WS_TABSTOP | WS_VSCROLL | WS_BORDER | ES_AUTOVSCROLL | ES_MULTILINE | ES_READONLY, 5, 35, 245, 180
+    CONTROL         "", IDC_RICHEDIT_INPUT, VULTURE_RICHEDIT_CLASS, WS_TABSTOP | WS_BORDER | ES_MULTILINE | ES_WANTRETURN, 5, 190, 245, 40
+    CONTROL         "", IDC_TREE_NAMES, "SysTreeView32", WS_TABSTOP | WS_BORDER | TVS_INFOTIP | TVS_NOHSCROLL | TVS_FULLROWSELECT, 255, 35, 65, 225
+    CONTROL         "", IDC_STATIC_ICON, "Static", SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 5, 5, 25, 21
     LTEXT           "", IDC_STATIC_NAME, 40, 5, 275, 8, SS_LEFT
     LTEXT           "", IDC_STATIC_TOPIC, 40, 15, 275, 8, SS_LEFT
 }
@@ -224,7 +232,7 @@ FONT 8, "Ms Shell Dlg"
 EXSTYLE WS_EX_TRANSPARENT
 FONT 8, "Ms Shell Dlg"
 {
-    CONTROL         "", IDC_TAB_CONVERSATIONS, WC_TABCONTROL, TCS_FOCUSNEVER, 5, 5, 270, 160, WS_EX_TRANSPARENT
+    CONTROL         "", IDC_TAB_CONVERSATIONS, "SysTabControl32", TCS_FOCUSNEVER, 5, 5, 270, 160, WS_EX_TRANSPARENT
 }
 
 
@@ -234,9 +242,9 @@ FONT 8, "Ms Shell Dlg"
 STYLE DS_3DLOOK | DS_CENTER | DS_SHELLFONT | WS_CHILDWINDOW | WS_DISABLED
 FONT 8, "Ms Shell Dlg"
 {
-    CONTROL         "", IDC_RICHEDIT_CONV, RICHEDIT_CLASS, WS_TABSTOP | WS_VSCROLL | WS_BORDER | ES_AUTOVSCROLL | ES_MULTILINE | ES_READONLY, 5, 35, 310, 150
-    CONTROL         "", IDC_RICHEDIT_INPUT, RICHEDIT_CLASS, WS_TABSTOP | WS_BORDER | ES_MULTILINE | ES_WANTRETURN, 5, 190, 310, 40
-    CONTROL         "", IDC_STATIC_ICON, WC_STATIC, SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 5, 5, 25, 21
+    CONTROL         "", IDC_RICHEDIT_CONV, VULTURE_RICHEDIT_CLASS, WS_TABSTOP | WS_VSCROLL | WS_BORDER | ES_AUTOVSCROLL | ES_MULTILINE | ES_READONLY, 5, 35, 310, 150
+    CONTROL         "", IDC_RICHEDIT_INPUT, VULTURE_RICHEDIT_CLASS, WS_TABSTOP | WS_BORDER | ES_MULTILINE | ES_WANTRETURN, 5, 190, 310, 40
+    CONTROL         "", IDC_STATIC_ICON, "Static", SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 5, 5, 25, 21
     LTEXT           "", IDC_STATIC_NAME, 40, 5, 275, 8, SS_LEFT
     LTEXT           "", IDC_STATIC_STATUS, 40, 15, 275, 8, SS_LEFT
 }
@@ -282,7 +290,7 @@ FONT 8, "Ms Shell Dlg"
 STYLE DS_3DLOOK | DS_CENTER | DS_CONTROL | DS_SHELLFONT | WS_VISIBLE | WS_CHILDWINDOW
 FONT 8, "Ms Shell Dlg"
 {
-    CONTROL         "", IDC_BUDDY_ICON, WC_STATIC, WS_TABSTOP | SS_BLACKFRAME | SS_NOTIFY | SS_SUNKEN, 5, 5, 30, 30
+    CONTROL         "", IDC_BUDDY_ICON, "Static", WS_TABSTOP | SS_BLACKFRAME | SS_NOTIFY | SS_SUNKEN, 5, 5, 30, 30
     CONTROL         "1", IDC_CBEX_STATUS, "ComboBoxEx32", 0x50000003, 40, 5, 115, 90
     EDITTEXT        IDC_EDIT_STATUSMSG, 40, 20, 115, 15, ES_AUTOHSCROLL
 }


More information about the Commits mailing list