Remove useless property pages Modified: trunk/reactos/lib/cpl/main/De.rc Modified: trunk/reactos/lib/cpl/main/En.rc Modified: trunk/reactos/lib/cpl/main/Ja.rc Modified: trunk/reactos/lib/cpl/main/Nl.rc Modified: trunk/reactos/lib/cpl/main/mouse.c Modified: trunk/reactos/lib/cpl/main/resource.h _____
Modified: trunk/reactos/lib/cpl/main/De.rc --- trunk/reactos/lib/cpl/main/De.rc 2005-11-26 12:14:28 UTC (rev 19633) +++ trunk/reactos/lib/cpl/main/De.rc 2005-11-26 12:37:49 UTC (rev 19634) @@ -1,29 +1,5 @@
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 1" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 -END - -IDD_PROPPAGE2 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 2" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 2",-1,73,74,90,8 -END - -IDD_PROPPAGE3 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 3" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 -END - STRINGTABLE BEGIN IDS_CPLNAME_1 "Maus" _____
Modified: trunk/reactos/lib/cpl/main/En.rc --- trunk/reactos/lib/cpl/main/En.rc 2005-11-26 12:14:28 UTC (rev 19633) +++ trunk/reactos/lib/cpl/main/En.rc 2005-11-26 12:37:49 UTC (rev 19634) @@ -1,29 +1,5 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 1" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 -END - -IDD_PROPPAGE2 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 2" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 2",-1,73,74,90,8 -END - -IDD_PROPPAGE3 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 3" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 -END - IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Speed" _____
Modified: trunk/reactos/lib/cpl/main/Ja.rc --- trunk/reactos/lib/cpl/main/Ja.rc 2005-11-26 12:14:28 UTC (rev 19633) +++ trunk/reactos/lib/cpl/main/Ja.rc 2005-11-26 12:37:49 UTC (rev 19634) @@ -1,29 +1,5 @@
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 1" -FONT 9, "MS UI Gothic" -BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 -END - -IDD_PROPPAGE2 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 2" -FONT 9, "MS UI Gothic" -BEGIN - LTEXT "Property Page 2",-1,73,74,90,8 -END - -IDD_PROPPAGE3 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 3" -FONT 9, "MS UI Gothic" -BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 -END - STRINGTABLE BEGIN IDS_CPLNAME_1 "â}âEâX" _____
Modified: trunk/reactos/lib/cpl/main/Nl.rc --- trunk/reactos/lib/cpl/main/Nl.rc 2005-11-26 12:14:28 UTC (rev 19633) +++ trunk/reactos/lib/cpl/main/Nl.rc 2005-11-26 12:37:49 UTC (rev 19634) @@ -1,29 +1,5 @@
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie
-IDD_PROPPAGE1 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 1" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 -END - -IDD_PROPPAGE2 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 2" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 2",-1,73,74,90,8 -END - -IDD_PROPPAGE3 DIALOGEX 0, 0, 246, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Property Page 3" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Property Page 3",-1,73,74,90,8 -END - STRINGTABLE BEGIN IDS_CPLNAME_1 "Muis" _____
Modified: trunk/reactos/lib/cpl/main/mouse.c --- trunk/reactos/lib/cpl/main/mouse.c 2005-11-26 12:14:28 UTC (rev 19633) +++ trunk/reactos/lib/cpl/main/mouse.c 2005-11-26 12:37:49 UTC (rev 19634) @@ -33,61 +33,8 @@
#include "resource.h"
- /* Property page dialog callback */ static INT_PTR CALLBACK -Page1Proc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - switch(uMsg) - { - case WM_INITDIALOG: - break; - } - return FALSE; -} - -/* Property page dialog callback */ -static INT_PTR CALLBACK -Page2Proc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - switch(uMsg) - { - case WM_INITDIALOG: - break; - } - return FALSE; -} - -/* Property page dialog callback */ -static INT_PTR CALLBACK -Page3Proc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - switch(uMsg) - { - case WM_INITDIALOG: - break; - } - return FALSE; -} - - -/* Property page dialog callback */ -static INT_PTR CALLBACK MouseHardwareProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, @@ -117,7 +64,7 @@ LONG APIENTRY MouseApplet(HWND hwnd, UINT uMsg, LONG lParam1, LONG lParam2) { - PROPSHEETPAGE psp[4]; + PROPSHEETPAGE psp[1]; PROPSHEETHEADER psh; TCHAR Caption[256];
@@ -134,10 +81,7 @@ psh.nStartPage = 0; psh.ppsp = psp;
- InitPropSheetPage(&psp[0], IDD_PROPPAGE1, Page1Proc); - InitPropSheetPage(&psp[1], IDD_PROPPAGE2, Page2Proc); - InitPropSheetPage(&psp[2], IDD_PROPPAGE3, Page3Proc); - InitPropSheetPage(&psp[3], IDD_HARDWARE, MouseHardwareProc); + InitPropSheetPage(&psp[0], IDD_HARDWARE, MouseHardwareProc);
return (LONG)(PropertySheet(&psh) != -1); } _____
Modified: trunk/reactos/lib/cpl/main/resource.h --- trunk/reactos/lib/cpl/main/resource.h 2005-11-26 12:14:28 UTC (rev 19633) +++ trunk/reactos/lib/cpl/main/resource.h 2005-11-26 12:37:49 UTC (rev 19634) @@ -5,9 +5,6 @@
#define IDC_CPLICON_1 1 #define IDC_CPLICON_2 2
-#define IDD_PROPPAGE1 100 -#define IDD_PROPPAGE2 101 -#define IDD_PROPPAGE3 102 #define IDD_KEYBSPEED 103 #define IDD_HARDWARE 104
-
hpoussin＠svn.reactos.com