interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

And quick and dirty migration of fontdialog.cpp back. Okay, after fixing the CMakeLists.txt, let's see how bad this is.

This commit is contained in:
Pietro Gagliardi 2018-03-17 14:47:20 -04:00
parent e08460adc3
commit cdaf49ec30
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
windows/OLD_fontdialog.cpp → windows/fontdialog.cpp
View File

@ -1,5 +1,6 @@
// 14 april 2016 // 14 april 2016
#include "uipriv_windows.hpp" #include "uipriv_windows.hpp"
#include "attrstr.hpp"
// TODOs // TODOs
// - quote the Choose Font sample here for reference // - quote the Choose Font sample here for reference
@ -590,7 +591,7 @@ static INT_PTR CALLBACK fontDialogDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, L
return FALSE; return FALSE;
} }
BOOL showFontDialog(HWND parent, struct fontDialogParams *params) BOOL uiprivShowFontDialog(HWND parent, struct fontDialogParams *params)
{ {
switch (DialogBoxParamW(hInstance, MAKEINTRESOURCE(rcFontDialog), parent, fontDialogDlgProc, (LPARAM) params)) { switch (DialogBoxParamW(hInstance, MAKEINTRESOURCE(rcFontDialog), parent, fontDialogDlgProc, (LPARAM) params)) {
case 1: // cancel case 1: // cancel
@ -622,7 +623,7 @@ static IDWriteFontFamily *tryFindFamily(IDWriteFontCollection *fc, const WCHAR *
return family; return family;
} }
void loadInitialFontDialogParams(struct fontDialogParams *params) void uiprivLoadInitialFontDialogParams(struct fontDialogParams *params)
{ {
struct fontCollection *fc; struct fontCollection *fc;
IDWriteFontFamily *family; IDWriteFontFamily *family;
@ -668,14 +669,14 @@ void loadInitialFontDialogParams(struct fontDialogParams *params)
fontCollectionFree(fc); fontCollectionFree(fc);
} }
void destroyFontDialogParams(struct fontDialogParams *params) void uiprivDestroyFontDialogParams(struct fontDialogParams *params)
{ {
params->font->Release(); params->font->Release();
uiFree(params->familyName); uiprivFree(params->familyName);
uiFree(params->styleName); uiprivFree(params->styleName);
} }
WCHAR *fontDialogParamsToString(struct fontDialogParams *params) WCHAR *uiprivFontDialogParamsToString(struct fontDialogParams *params)
{ {
WCHAR *text; WCHAR *text;