Mercurial > hg > xemacs-beta

diff src/dialog-msw.c @ 440:8de8e3f6228a r21-2-28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-28
author cvs
date Mon, 13 Aug 2007 11:33:38 +0200
parents 3ecd8885ac67
children abe6d1db359e
line wrap: on
line diff
--- a/src/dialog-msw.c	Mon Aug 13 11:32:27 2007 +0200
+++ b/src/dialog-msw.c	Mon Aug 13 11:33:38 2007 +0200
@@ -159,8 +159,9 @@
   Charcount length = XSTRING_CHAR_LENGTH (string);
   LPWSTR uni_string;
 
-  GET_C_CHARPTR_EXT_DATA_ALLOCA (XSTRING_DATA (string),
-				 FORMAT_OS, mbcs_string);
+  TO_EXTERNAL_FORMAT (LISP_STRING, string,
+		      C_STRING_ALLOCA, mbcs_string,
+		      Qnative);
   uni_string = alloca_array (WCHAR, length + 1);
   length = MultiByteToWideChar (CP_ACP, 0, mbcs_string, -1,
 				uni_string, sizeof(WCHAR) * (length + 1));
@@ -344,7 +345,7 @@
     for (i = 0; i < Dynarr_length (dialog_items); ++i)
       {
 	Lisp_Object* gui_item = Dynarr_atp (dialog_items, i);
-	struct Lisp_Gui_Item *pgui_item = XGUI_ITEM (*gui_item);
+	Lisp_Gui_Item *pgui_item = XGUI_ITEM (*gui_item);
 
 	item_tem.style = (WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON
 			  | (gui_item_active_p (*gui_item) ? 0 : WS_DISABLED));