notepad upgrades 2

[Shachar Shemesh]

Shachar Shemesh wrote:

> These changes add font selection support to notepad, as well as 
> solving a compilation warning on Visual C and adding accelerators.
>
> Changelog:
> Shachar Shemesh <winecode at sun.consumer.org.il>
>
> programs/notepad/dialog.c
>
>    * Fix warning about converting double to int.
>    * Implemented font selection
>
> programs/notepad/En.rc
>
>    * Added accelerators resource
>    * Added the "Font" entry.
>
> programs/notepad/main.c
>
>    * Added support for switching fonts.

The attached diff solves a compilation warning and a menu keyboard 
shortcut conflict.

-------------- next part --------------
Common subdirectories: programs/notepad.orig/CVS and programs/notepad/CVS
diff -u programs/notepad.orig/En.rc programs/notepad/En.rc
--- programs/notepad.orig/En.rc	2003-01-25 19:39:54.000000000 +0200
+++ programs/notepad/En.rc	2003-01-25 19:36:27.000000000 +0200
@@ -49,7 +49,7 @@
   MENUITEM "&Search\tCtrl+F",   CMD_SEARCH
   MENUITEM "&Search next\tF3",  CMD_SEARCH_NEXT
  }
-POPUP "&Format" {
+POPUP "F&ormat" {
   MENUITEM "&Wrap long lines",  CMD_WRAP
   MENUITEM "&Font...",          CMD_FONT
  }
Only in programs/notepad: License_En.o
Only in programs/notepad: Makefile
diff -u programs/notepad.orig/dialog.h programs/notepad/dialog.h
--- programs/notepad.orig/dialog.h	2002-07-16 04:09:24.000000000 +0300
+++ programs/notepad/dialog.h	2003-01-25 19:21:55.000000000 +0200
@@ -34,11 +34,13 @@
 VOID DIALOG_EditDelete(VOID);
 VOID DIALOG_EditSelectAll(VOID);
 VOID DIALOG_EditTimeDate(VOID);
-VOID DIALOG_EditWrap(VOID);
 
 VOID DIALOG_Search(VOID);
 VOID DIALOG_SearchNext(VOID);
 
+VOID DIALOG_EditWrap(VOID);
+VOID DIALOG_SelectFont(VOID);
+
 VOID DIALOG_HelpContents(VOID);
 VOID DIALOG_HelpSearch(VOID);
 VOID DIALOG_HelpHelp(VOID);