[fireball] 36303: - Select ANSI_VAR_FONT in explorer when drawing start button text and desktop switching buttons text. Based on Juriy Sidorov's patch from bug 3484. See issue #3484 for more details.

Author: fireball
Date: Thu Sep 18 07:56:52 2008
New Revision: 36303

URL: http://svn.reactos.org/svn/reactos?rev=36303&view=rev
Log:
- Select ANSI_VAR_FONT in explorer when drawing start button text and desktop switching buttons text. Based on Juriy Sidorov's patch from bug 3484.
See issue #3484 for more details.

Modified:
    trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp
    trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp

Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskbar...
==============================================================================
--- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] Thu Sep 18 07:56:52 2008
@@ -93,6 +93,7 @@
     // create start button
    ResString start_str(IDS_START);
    WindowCanvas canvas(_hwnd);
+	FontSelection font(canvas, GetStockFont(ANSI_VAR_FONT));
    RECT rect = {0, 0};
    DrawText(canvas, start_str, -1, &rect, DT_SINGLELINE|DT_CALCRECT);
    int start_btn_width = rect.right+16+8;
@@ -101,6 +102,7 @@

// create "Start" button
    HWND hwndStart = Button(_hwnd, start_str, 1, 1, start_btn_width, REBARBAND_HEIGHT, IDC_START, WS_VISIBLE|WS_CHILD|BS_OWNERDRAW);
+	SetWindowFont(hwndStart, GetStockFont(ANSI_VAR_FONT), FALSE);
    new StartButton(hwndStart);

/* Save the handle to the window, needed for push-state handling */

Modified: trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskbar...
==============================================================================
--- trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp [iso-8859-1] Thu Sep 18 07:56:52 2008
@@ -141,6 +141,7 @@
    	HBITMAP hbmp = CreateCompatibleBitmap(canvas, cx, cy);
    	HBITMAP hbmp_old = SelectBitmap(hdc, hbmp);

+		FontSelection font(hdc, GetStockFont(ANSI_VAR_FONT));
    	FmtString num_txt(TEXT("%d"), i+1);
    	TextColor color(hdc, RGB(64,64,64));
    	BkMode mode(hdc, TRANSPARENT);