TheCloud/nuklear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #860 from Tropby/master

Browse Source 
Minor fixes to compile GDI with mingw 32bit
This commit is contained in:
dumblob 2019-06-15 21:37:25 +02:00 committed by GitHub
commit bb327b97a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demo/gdi/nuklear_gdi.h
View File

@ -105,7 +105,7 @@ nk_delete_image(struct nk_image * image)
{ {
if (image && image->handle.id != 0) if (image && image->handle.id != 0)
{ {
HBITMAP hbm = image->handle.ptr; HBITMAP hbm = (HBITMAP)image->handle.ptr;
DeleteObject(hbm); DeleteObject(hbm);
memset(image, 0, sizeof(struct nk_image)); memset(image, 0, sizeof(struct nk_image));
} }
@ -115,7 +115,7 @@ static void
nk_gdi_draw_image(short x, short y, unsigned short w, unsigned short h, nk_gdi_draw_image(short x, short y, unsigned short w, unsigned short h,
struct nk_image img, struct nk_color col) struct nk_image img, struct nk_color col)
{ {
HBITMAP hbm = img.handle.ptr; HBITMAP hbm = (HBITMAP)img.handle.ptr;
HDC hDCBits; HDC hDCBits;
BITMAP bitmap; BITMAP bitmap;
@ -483,7 +483,7 @@ nk_gdifont_create(const char *name, int size)
if (!font) if (!font)
return NULL; return NULL;
font->dc = CreateCompatibleDC(0); font->dc = CreateCompatibleDC(0);
font->handle = CreateFont(size, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, CLEARTYPE_QUALITY, DEFAULT_PITCH | FF_DONTCARE, name); font->handle = CreateFontA(size, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, CLEARTYPE_QUALITY, DEFAULT_PITCH | FF_DONTCARE, name);
SelectObject(font->dc, font->handle); SelectObject(font->dc, font->handle);
GetTextMetricsW(font->dc, &metric); GetTextMetricsW(font->dc, &metric);
font->height = metric.tmHeight; font->height = metric.tmHeight;