From f5fe94717790f29c91363f6f650d7b2e38b121e5 Mon Sep 17 00:00:00 2001
From: Ged Murphy <gedmurphy@reactos.org>
Date: Thu, 9 Nov 2006 20:28:29 +0000
Subject: [PATCH] - add some font data to the combo boxes

svn path=/trunk/; revision=24709
---
 reactos/base/applications/imagesoft/custcombo.c   |  2 +-
 reactos/base/applications/imagesoft/floatwindow.c |  8 ++++++--
 .../base/applications/imagesoft/imagesoft.rbuild  |  1 +
 reactos/base/applications/imagesoft/mainwnd.c     | 15 +++++++++++----
 reactos/base/applications/imagesoft/precomp.h     |  5 +++++
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/reactos/base/applications/imagesoft/custcombo.c b/reactos/base/applications/imagesoft/custcombo.c
index 10efda94bd0..eef869f28f2 100644
--- a/reactos/base/applications/imagesoft/custcombo.c
+++ b/reactos/base/applications/imagesoft/custcombo.c
@@ -1,4 +1,4 @@
-#include "precomp.h"
+#include <precomp.h>
 
 
 LRESULT WINAPI
diff --git a/reactos/base/applications/imagesoft/floatwindow.c b/reactos/base/applications/imagesoft/floatwindow.c
index 03b9204fc16..38e201cb893 100644
--- a/reactos/base/applications/imagesoft/floatwindow.c
+++ b/reactos/base/applications/imagesoft/floatwindow.c
@@ -357,7 +357,7 @@ FloatToolbarWndProc(HWND hwnd,
     switch(Message)
     {
         case WM_CREATE:
-
+        {
             FltInfo = (PFLT_WND)(((LPCREATESTRUCT)lParam)->lpCreateParams);
 
             /*FIXME: read this from registry */
@@ -375,7 +375,7 @@ FloatToolbarWndProc(HWND hwnd,
                                        0,
                                        (255 * 60) / 100,
                                        LWA_ALPHA);
-
+        }
         break;
 
         case WM_TIMER:
@@ -423,6 +423,7 @@ FloatToolbarWndProc(HWND hwnd,
 
         case WM_NCMOUSEMOVE:
         case WM_MOUSEMOVE:
+        {
             if (FltInfo->bOpaque == FALSE)
             {
                 SetWindowLong(hwnd,
@@ -442,6 +443,7 @@ FloatToolbarWndProc(HWND hwnd,
                          200,
                          NULL);
             }
+        }
         break;
 
         case WM_CLOSE:
@@ -449,6 +451,7 @@ FloatToolbarWndProc(HWND hwnd,
         break;
 
         case WM_COMMAND:
+        {
             if (LOWORD(wParam) == IDCANCEL)
                 ShowHideWindow(FltInfo);
 
@@ -483,6 +486,7 @@ FloatToolbarWndProc(HWND hwnd,
                                 lParam);*/
                 break;
             }
+        }
         break;
 
         case WM_NCACTIVATE:
diff --git a/reactos/base/applications/imagesoft/imagesoft.rbuild b/reactos/base/applications/imagesoft/imagesoft.rbuild
index 6879208bacb..69bdab61eef 100644
--- a/reactos/base/applications/imagesoft/imagesoft.rbuild
+++ b/reactos/base/applications/imagesoft/imagesoft.rbuild
@@ -19,6 +19,7 @@
 			<file>about.c</file>
 			<file>custcombo.c</file>
 			<file>floatwindow.c</file>
+			<file>font.c</file>
 			<file>imageprop.c</file>
 			<file>imagesoft.c</file>
 			<file>imgedwnd.c</file>
diff --git a/reactos/base/applications/imagesoft/mainwnd.c b/reactos/base/applications/imagesoft/mainwnd.c
index b17367a65c6..aeed9b55b69 100644
--- a/reactos/base/applications/imagesoft/mainwnd.c
+++ b/reactos/base/applications/imagesoft/mainwnd.c
@@ -35,9 +35,9 @@ TBBUTTON StdButtons[] = {
 TBBUTTON TextButtons[] = {
     {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0},                              /* separator */
 
-    {TBICON_BOLD,     ID_BOLD,     TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0},    /* bold */
-    {TBICON_ITALIC,   ID_ITALIC,   TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0},    /* italic */
-    {TBICON_ULINE,    ID_ULINE,    TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0},    /* underline */
+    {TBICON_BOLD,     ID_BOLD,     TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_CHECK, {0}, 0, 0},    /* bold */
+    {TBICON_ITALIC,   ID_ITALIC,   TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_CHECK, {0}, 0, 0},    /* italic */
+    {TBICON_ULINE,    ID_ULINE,    TBSTATE_ENABLED, BTNS_BUTTON | TBSTYLE_CHECK, {0}, 0, 0},    /* underline */
 
     {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0},                              /* separator */
 
@@ -221,7 +221,8 @@ MainWndCreateToolbarClient(struct _TOOLBAR_DOCKS *TbDocks,
             hFontType = CreateWindowEx(0,
                                        WC_COMBOBOX,
                                        NULL,
-                                       WS_CHILD | WS_VISIBLE | CBS_DROPDOWN,
+                                       WS_CHILD | WS_VISIBLE | WS_VSCROLL |
+                                        CBS_DROPDOWN | CBS_SORT | CBS_HASSTRINGS, //| CBS_OWNERDRAWFIXED,
                                        0, 0, 120, 0,
                                        hParent,
                                        NULL,
@@ -243,6 +244,9 @@ MainWndCreateToolbarClient(struct _TOOLBAR_DOCKS *TbDocks,
                 {
                     DestroyWindow(hFontType);
                 }
+
+                    /* Create the list of fonts */
+                    FillFontStyleComboList(hFontType);
             }
 
             /* font size combo */
@@ -270,6 +274,9 @@ MainWndCreateToolbarClient(struct _TOOLBAR_DOCKS *TbDocks,
                 {
                     DestroyWindow(hFontSize);
                 }
+
+                /* Update the font-size-list */
+                FillFontSizeComboList(hFontSize);
             }
             break;
         }
diff --git a/reactos/base/applications/imagesoft/precomp.h b/reactos/base/applications/imagesoft/precomp.h
index f05d0940094..1619d529c4e 100644
--- a/reactos/base/applications/imagesoft/precomp.h
+++ b/reactos/base/applications/imagesoft/precomp.h
@@ -390,6 +390,11 @@ BOOL InitFloatWndClass(VOID);
 VOID UninitFloatWndImpl(VOID);
 BOOL ShowHideWindow(PFLT_WND FltInfo);
 
+/* font.c */
+VOID FillFontStyleComboList(HWND hwndCombo);
+VOID FillFontSizeComboList(HWND hwndCombo);
+
+/* custcombo.c */
 VOID MakeFlatCombo(HWND hwndCombo);
 
 #endif /* __IMAGESOFT_PRECOMP_H */