draw button control with original border; focus handling in property sheet

svn path=/trunk/; revision=7741

reactos/subsys/system/explorer/explorer_intres.h

@@ -31,6 +31,9 @@
 #define IDS_ABOUT_EXPLORER              27
 #define IDS_LAUNCH_MANY_PROGRAMS        28
 #define IDS_DESKTOPBAR_SETTINGS         29
+#define IDS_DESKTOP                     30
+#define IDS_TASKBAR                     31
+#define IDS_STARTMENU                   32
 #define IDI_REACTOS                     100
 #define IDI_EXPLORER                    101
 #define IDI_STARTMENU                   102
@@ -90,12 +93,12 @@
 #define IDC_BUTTON1                     1002
 #define IDC_ICON_ALIGN_0                1002
 #define IDC_ICON_ALIGN_1                1003
-#define IDC_ICON_ALIGN_2                1006
+#define IDC_ICON_ALIGN_2                1004
-#define IDC_ICON_ALIGN_3                1007
+#define IDC_ICON_ALIGN_3                1005
-#define IDC_ICON_ALIGN_4                1008
+#define IDC_ICON_ALIGN_4                1006
-#define IDC_ICON_ALIGN_5                1009
+#define IDC_ICON_ALIGN_5                1007
-#define IDC_ICON_ALIGN_6                1010
+#define IDC_ICON_ALIGN_6                1008
-#define IDC_ICON_ALIGN_7                1011
+#define IDC_ICON_ALIGN_7                1009
 #define IDC_WWW                         1012
 #define IDC_TOPIC                       1017
 #define IDC_MAILS_FOUND                 1018

reactos/subsys/system/explorer/explorer_intres.rc

@@ -119,6 +119,13 @@ BEGIN
     IDS_LAUNCH_MANY_PROGRAMS 
                             "You have selected more than one program.\nAre you sure you want to launch all of them?"
     IDS_DESKTOPBAR_SETTINGS "Desktop Settings"
+    IDS_DESKTOP             "Desktop"
+    IDS_TASKBAR             "Taskbar"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_STARTMENU           "Startmenu"
 END
 
 #endif    // Romanian resources
@@ -483,6 +490,13 @@ BEGIN
     IDS_LAUNCH_MANY_PROGRAMS 
                             "Sie haben mehrere Programme ausgewählt.\nSind Sie sicher, daß sie diese alle starten wollen?"
     IDS_DESKTOPBAR_SETTINGS "Desktop-Einstellungen"
+    IDS_DESKTOP             "Desktop"
+    IDS_TASKBAR             "Taskbar"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_STARTMENU           "Startmenu"
 END
 
 #endif    // German (Germany) resources
@@ -699,7 +713,7 @@ BEGIN
                     BS_BOTTOM | WS_TABSTOP,56,25,44,41
     CONTROL         "right/top left",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | 
                     BS_BOTTOM | WS_TABSTOP,111,25,44,41
-    CONTROL         "right/top up",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | 
+    CONTROL         "rig./top dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | 
                     BS_BOTTOM | WS_TABSTOP,159,25,44,41
     CONTROL         "left/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | 
                     BS_BOTTOM | WS_TABSTOP,7,76,44,41
@@ -707,7 +721,7 @@ BEGIN
                     BS_BOTTOM | WS_TABSTOP,56,76,44,41
     CONTROL         "right/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | 
                     BS_BOTTOM | WS_TABSTOP,111,76,44,41
-    CONTROL         "right/bot. up",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | 
+    CONTROL         "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | 
                     BS_BOTTOM | WS_TABSTOP,159,76,44,41
 END
 
@@ -810,6 +824,13 @@ BEGIN
     IDS_LAUNCH_MANY_PROGRAMS 
                             "You have selected more than one program.\nAre you sure you want to launch all of them?"
     IDS_DESKTOPBAR_SETTINGS "Desktop Settings"
+    IDS_DESKTOP             "Desktop"
+    IDS_TASKBAR             "Taskbar"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_STARTMENU           "Startmenu"
 END
 
 #endif    // English (U.S.) resources
@@ -923,6 +944,13 @@ BEGIN
     IDS_LAUNCH_MANY_PROGRAMS 
                             "You have selected more than one program.\nAre you sure you want to launch all of them?"
     IDS_DESKTOPBAR_SETTINGS "Desktop Settings"
+    IDS_DESKTOP             "Desktop"
+    IDS_TASKBAR             "Taskbar"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_STARTMENU           "Startmenu"
 END
 
 #endif    // French (France) resources

reactos/subsys/system/explorer/utility/window.cpp

@@ -842,15 +842,6 @@ void DrawGrayText(HDC hdc, LPRECT pRect, LPCTSTR title, int dt_flags)
 }
 
 
-static BOOL DrawButton(HDC hdc, LPRECT prect, UINT state, HBRUSH hbrush)
-{
-	FillRect(hdc, prect, hbrush);
-	DrawEdge(hdc, prect, EDGE_RAISED, BF_RECT|BF_SOFT);
-
-	return TRUE;
-}
-
-
 /* not yet used
 void ColorButton::DrawItem(LPDRAWITEMSTRUCT dis)
 {
@@ -868,7 +859,6 @@ void ColorButton::DrawItem(LPDRAWITEMSTRUCT dis)
 	}
 
 	DrawFrameControl(dis->hDC, &dis->rcItem, DFC_BUTTON, state);
-	//DrawButton(dis->hDC, &dis->rcItem, state, GetSysColorBrush(COLOR_BTNFACE));
 
 	TCHAR title[BUFFER_LEN];
 	GetWindowText(_hwnd, title, BUFFER_LEN);
@@ -946,8 +936,7 @@ void PictureButton::DrawItem(LPDRAWITEMSTRUCT dis)
 		if (style & BS_FLAT)	// Only with BS_FLAT set, there will be drawn a frame without highlight.
 			DrawEdge(dis->hDC, &dis->rcItem, EDGE_RAISED, BF_RECT|BF_FLAT);
 	} else
-		//DrawFrameControl(dis->hDC, &dis->rcItem, DFC_BUTTON, state);
+		DrawFrameControl(dis->hDC, &dis->rcItem, DFC_BUTTON, state);
-		DrawButton(dis->hDC, &dis->rcItem, state, _hBrush);
 
 	if (_hIcon)
 		DrawIconEx(dis->hDC, imagePos.x, imagePos.y, _hIcon, _cx, _cy, 0, _hBrush, DI_NORMAL);