more small fixes

svn path=/trunk/; revision=7356

diff --git a/reactos/apps/dist/notepad/.cvsignore b/reactos/apps/dist/notepad/.cvsignore
index d63774a..4aed8fd 100644 (file)
--- a/reactos/apps/dist/notepad/.cvsignore
+++ b/reactos/apps/dist/notepad/.cvsignore
@@ -4,3 +4,8 @@
 *.coff
 *.sym
 *.map
+notepad.nostrip.exe
+notepad.ncb
+notepad.suo
+notepad.exe
+Release
\ No newline at end of file

diff --git a/reactos/apps/dist/notepad/notepad.c b/reactos/apps/dist/notepad/notepad.c
index 0d1a688..a4bce2d 100644 (file)
--- a/reactos/apps/dist/notepad/notepad.c
+++ b/reactos/apps/dist/notepad/notepad.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *  $Id: notepad.c,v 1.1 2003/12/30 11:52:04 rcampbell Exp $
+ *  $Id: notepad.c,v 1.2 2003/12/31 00:38:09 rcampbell Exp $
  *
  *  COPYRIGHT:        See COPYING in the top level directory
  *  PROJECT:          ReactOS Applications
@@ -70,18 +70,12 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
     return DefWindowProc(hWnd, uMsg, wParam, lParam);
 }
 
-LRESULT WINAPI EditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-    return DefWindowProc(hWnd, uMsg, wParam, lParam);
-}
-
 HWND CreateMainWnd()
 {
     WNDCLASS wc;
        HWND hWnd;
-       wc.style = CS_HREDRAW | CS_VREDRAW;
        wc.lpszMenuName = NULL;
-       wc.lpszClassName = TEXT("notepad");
+       wc.lpszClassName = TEXT("Notepad");
        wc.lpfnWndProc = MainWndProc;
        
        wc.hbrBackground = GetSysColorBrush(COLOR_BTNFACE);
@@ -91,17 +85,20 @@ HWND CreateMainWnd()
        if(!RegisterClass(&wc))
                return NULL;
 
-       hWnd = CreateWindow("notepad",
-                                               "Notepad",
-                                               WS_OVERLAPPEDWINDOW,
-                                               CW_USEDEFAULT,
-                                               CW_USEDEFAULT,
-                                               CW_USEDEFAULT,
-                                               CW_USEDEFAULT,
-                                               0,
-                                               LoadMenu(NULL,MAKEINTRESOURCE(IDC_NOTEPAD)),
-                                               NULL,
-                                               0);
+       hWnd = CreateWindowEx( WS_EX_ACCEPTFILES | WS_EX_WINDOWEDGE |
+                                                  WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR |
+                                                  WS_EX_LEFT,
+                                                  "Notepad",
+                                                  "Notepad",
+                                                  WS_OVERLAPPEDWINDOW,
+                                                  CW_USEDEFAULT,
+                                                  CW_USEDEFAULT,
+                                                  CW_USEDEFAULT,
+                                                  CW_USEDEFAULT,
+                                                  0,
+                                                  LoadMenu(NULL,MAKEINTRESOURCE(IDC_NOTEPAD)),
+                                                  NULL,
+                                                  0);
 
     return hWnd;
 }
@@ -109,12 +106,11 @@ HWND CreateMainWnd()
 HWND CreateEditWnd(HWND hParent, DWORD dwWidth, DWORD dwHeight)
 {
                HWND hWnd;
-               hWnd = CreateWindowEx(WS_EX_CLIENTEDGE,
+               hWnd = CreateWindowEx(WS_EX_CLIENTEDGE | WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR,
                                                "EDIT",
                                                NULL,
                                                WS_HSCROLL | WS_VSCROLL | WS_VISIBLE |
-                                               WS_CHILD | ES_AUTOHSCROLL | ES_AUTOVSCROLL |
-                                               ES_MULTILINE | ES_WANTRETURN,
+                                               WS_CHILD | ES_LEFT | ES_MULTILINE | ES_NOHIDESEL,
                                                0,
                                                0,
                                                dwWidth,
@@ -153,24 +149,13 @@ WinMain(HINSTANCE hInstance,
 
     hAccel = LoadAccelerators( hInstance, MAKEINTRESOURCE(IDC_NOTEPAD) );
 
-    if( hAccel != NULL )
-    {
-        while( GetMessage(&msg, 0, 0, 0)) {
-            if( !TranslateAccelerator(g_hWnd, hAccel, &msg ) )
-                       {
-                TranslateMessage( &msg );
-                DispatchMessage( &msg );
-            }
-        }
-    }
-       else
-    {
-        while (GetMessage(&msg, 0, 0, 0))
+    while( GetMessage(&msg, 0, 0, 0))
+       {
+               if( !TranslateAccelerator(g_hWnd, hAccel, &msg ) )
                {
-            TranslateMessage(&msg);
-            DispatchMessage(&msg);
+                       TranslateMessage( &msg );
+            DispatchMessage( &msg );
         }
     }
-
     return 0;
 }

diff --git a/reactos/apps/dist/notepad/notepad.rc b/reactos/apps/dist/notepad/notepad.rc
index bb19afa..081d3a1 100644 (file)
--- a/reactos/apps/dist/notepad/notepad.rc
+++ b/reactos/apps/dist/notepad/notepad.rc
@@ -55,20 +55,19 @@ BEGIN
     POPUP "&Edit"
     BEGIN
         MENUITEM "&Undo\tCtrl+Z",               ID_EDIT_UNDO
-        MENUITEM "&Redo\tCtrl+Y",               ID_EDIT_REDO
         MENUITEM SEPARATOR
-        MENUITEM "Cu&t",                        ID_EDIT_CUT
-        MENUITEM "&Copy",                       ID_EDIT_COPY
-        MENUITEM "&Paste",                      ID_EDIT_PASTE
-        MENUITEM "De&lete",                     ID_EDIT_DELETE
+        MENUITEM "Cu&t\tCtrl+X",                ID_EDIT_CUT
+        MENUITEM "&Copy\tCtrl+C",               ID_EDIT_COPY
+        MENUITEM "&Paste\tCtrl+V",              ID_EDIT_PASTE
+        MENUITEM "De&lete\tDel",                ID_EDIT_DELETE
         MENUITEM SEPARATOR
-        MENUITEM "&Find...",                    ID_EDIT_FIND
-        MENUITEM "Find &Next",                  ID_EDIT_FINDNEXT
-        MENUITEM "&Replace...",                 ID_EDIT_REPLACE
-        MENUITEM "&Goto",                       ID_EDIT_GOTO
+        MENUITEM "&Find...\tCtrl+F",            ID_EDIT_FIND
+        MENUITEM "Find &Next\tF3",              ID_EDIT_FINDNEXT
+        MENUITEM "&Replace...\tCtrl+H",         ID_EDIT_REPLACE
+        MENUITEM "&Goto\tCtrl+G",               ID_EDIT_GOTO
         MENUITEM SEPARATOR
-        MENUITEM "Select &All",                 ID_EDIT_SELECTALL
-        MENUITEM "Time/&Date",                  ID_EDIT_TIME
+        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECTALL
+        MENUITEM "Time/&Date\tF5",              ID_EDIT_TIME
     END
     POPUP "&Format"
     BEGIN
@@ -77,7 +76,7 @@ BEGIN
     END
     POPUP "&View"
     BEGIN
-        MENUITEM "&Status Bar",                 ID_VIEW_STATUSBAR, CHECKED
+        MENUITEM "&Status Bar",                 ID_VIEW_STATUSBAR
     END
     POPUP "&Help"
     BEGIN
@@ -97,8 +96,21 @@ END
 
 IDC_NOTEPAD ACCELERATORS 
 BEGIN
-    "X",            ID_FILE_EXIT,           VIRTKEY, CONTROL, NOINVERT
     "N",            ID_FILE_NEW,            VIRTKEY, CONTROL, NOINVERT
+    "O",            ID_FILE_OPEN,           VIRTKEY, CONTROL, NOINVERT
+    "S",            ID_FILE_SAVE,           VIRTKEY, CONTROL, NOINVERT
+    "P",            ID_FILE_PRINT,          VIRTKEY, CONTROL, NOINVERT
+    "Z",            ID_EDIT_UNDO,           VIRTKEY, CONTROL, NOINVERT
+    "X",            ID_EDIT_CUT,            VIRTKEY, CONTROL, NOINVERT
+    "C",            ID_EDIT_COPY,           VIRTKEY, CONTROL, NOINVERT
+    "V",            ID_EDIT_PASTE,          VIRTKEY, CONTROL, NOINVERT
+    VK_DELETE,      ID_EDIT_DELETE,         VIRTKEY, NOINVERT
+    "F",            ID_EDIT_FIND,           VIRTKEY, CONTROL, NOINVERT
+    VK_F3,          ID_EDIT_FINDNEXT,       VIRTKEY, NOINVERT
+    "H",            ID_EDIT_REPLACE,        VIRTKEY, CONTROL, NOINVERT
+    "G",            ID_EDIT_GOTO,           VIRTKEY, CONTROL, NOINVERT
+    "A",            ID_EDIT_SELECTALL,      VIRTKEY, CONTROL, NOINVERT
+    VK_F5,          ID_EDIT_TIME,           VIRTKEY, NOINVERT
 END
 
 

diff --git a/reactos/apps/dist/notepad/resource.h b/reactos/apps/dist/notepad/resource.h
index 9ac25ba..60d5747 100644 (file)
--- a/reactos/apps/dist/notepad/resource.h
+++ b/reactos/apps/dist/notepad/resource.h
@@ -43,7 +43,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        129
-#define _APS_NEXT_COMMAND_VALUE         32799
+#define _APS_NEXT_COMMAND_VALUE         32816
 #define _APS_NEXT_CONTROL_VALUE         1000
 #define _APS_NEXT_SYMED_VALUE           110
 #endif