From cedb5394b430954ffe82285e19b576cfcd389a65 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Fri, 15 Apr 2016 13:57:26 -0400 Subject: [PATCH] Removed the small caps checkbox from the new font dialog. It turns out that the small caps in DirectWrite is applied to a text layout, not a part of a font like it is elsewhere. Do we even still need the custom font dialog? --- windows/fontdialog.cpp | 4 ---- windows/resources.h | 1 - windows/resources.rc | 3 --- 3 files changed, 8 deletions(-) diff --git a/windows/fontdialog.cpp b/windows/fontdialog.cpp index 1068f1ab..f0bd0bf2 100644 --- a/windows/fontdialog.cpp +++ b/windows/fontdialog.cpp @@ -6,7 +6,6 @@ struct fontDialog { HWND familyCombobox; HWND styleCombobox; HWND sizeCombobox; - HWND smallCapsCheckbox; // TODO desc; fontCollection *fc; IDWriteFontFamily **families; @@ -137,9 +136,6 @@ static struct fontDialog *beginFontDialog(HWND hwnd, LPARAM lParam) f->sizeCombobox = GetDlgItem(f->hwnd, rcFontSizeCombobox); if (f->sizeCombobox == NULL) logLastError("error getting font size combobox handle in beginFontDialog()"); - f->smallCapsCheckbox = GetDlgItem(f->hwnd, rcFontSmallCapsCheckbox); - if (f->smallCapsCheckbox == NULL) - logLastError("error getting small caps checkbox handle in beginFontDialog()"); f->fc = loadFontCollection(); f->nFamilies = f->fc->fonts->GetFontFamilyCount(); diff --git a/windows/resources.h b/windows/resources.h index a1250cfc..f2bec17e 100644 --- a/windows/resources.h +++ b/windows/resources.h @@ -6,4 +6,3 @@ #define rcFontFamilyCombobox 1000 #define rcFontStyleCombobox 1001 #define rcFontSizeCombobox 1002 -#define rcFontSmallCapsCheckbox 1003 diff --git a/windows/resources.rc b/windows/resources.rc index b8e83cc7..7b9ea1f7 100644 --- a/windows/resources.rc +++ b/windows/resources.rc @@ -40,9 +40,6 @@ BEGIN CBS_SIMPLE | CBS_AUTOHSCROLL | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_HASSTRINGS - AUTOCHECKBOX "S&mall caps", rcFontSmallCapsCheckbox, - 13, 111, 90, 10, WS_TABSTOP - GROUPBOX "Sample", -1, 114, 97, 120, 43, WS_GROUP DEFPUSHBUTTON "OK", IDOK, 141, 215, 45, 14, WS_GROUP