From 24a0e93b819ab10925688ed4596c3f90ce8e3f78 Mon Sep 17 00:00:00 2001 From: Rr42 Date: Thu, 14 Jun 2018 17:08:07 +0530 Subject: PaintWindow update, partial port (bug with text scaling) --- ldmicro/lib/linuxUI/linuxLD.h | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) (limited to 'ldmicro/lib/linuxUI/linuxLD.h') diff --git a/ldmicro/lib/linuxUI/linuxLD.h b/ldmicro/lib/linuxUI/linuxLD.h index 6f1e4f0..5f8e0e7 100644 --- a/ldmicro/lib/linuxUI/linuxLD.h +++ b/ldmicro/lib/linuxUI/linuxLD.h @@ -4,6 +4,7 @@ #include "linuxUI.h" #include #include +#include #include #include @@ -21,6 +22,9 @@ #define IMAGE_ICON 1 #define LDMICRO_ICON "../ldmicro.ico" +/// Macro functions +#define max(_A, _B) std::max(_A, _B) + /// Typedefs //typedef int64_t __int64; typedef bool BOOL; @@ -54,14 +58,14 @@ typedef CHAR *LPSTR; typedef void *PVOID; typedef void *LPVOID; -typedef PVOID HFONT; typedef PVOID HMODULE; typedef PVOID HHOOK; -typedef PVOID HFONT; typedef PVOID HANDLE; typedef HANDLE HINSTANCE; -typedef HANDLE HDC; +typedef HANDLE HGDIOBJ; + +typedef cairo_t *HCRDC; typedef GtkWidget *HWID; typedef GtkWidget *HMENU; typedef GtkWindow *HWND; @@ -106,6 +110,14 @@ typedef class tagColorReferance: public GdkRGBA{ this->alpha = 1.0; } + // tagColorReferance(tagColorReferance &refCpy) + // { + // this->red = refCpy.red; + // this->green = refCpy.green; + // this->blue = refCpy.blue; + // this->alpha = refCpy.alpha; + // } + GdkRGBA* getThis() { return this; @@ -143,6 +155,21 @@ typedef struct tagNMHDR { UINT code; } NMHDR; +typedef struct FontTag { + int nHeight; + int nWidth; + int nOrientation; + int fnWeight; + DWORD fdwItalic; + LPCTSTR lpszFace; +} *HFONT, FONT; + +typedef struct tagLOGBRUSH { + UINT lbStyle; + COLORREF lbColor; +// ULONG_PTR lbHatch; +} LOGBRUSH, *PLOGBRUSH; + /// Variables extern std::vector HeapRecord; -- cgit