summaryrefslogtreecommitdiff
path: root/plugins/ExternalAPI/m_skin_eng.h
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/ExternalAPI/m_skin_eng.h')
-rw-r--r--plugins/ExternalAPI/m_skin_eng.h27
1 files changed, 15 insertions, 12 deletions
diff --git a/plugins/ExternalAPI/m_skin_eng.h b/plugins/ExternalAPI/m_skin_eng.h
index 968e3b1b4b..931097b86d 100644
--- a/plugins/ExternalAPI/m_skin_eng.h
+++ b/plugins/ExternalAPI/m_skin_eng.h
@@ -134,17 +134,17 @@ struct GLYPHOBJECT
/* SKINTEXTDESCRIPTOR opbject descriptor structure */
struct GLYPHTEXT
{
- char *szGlyphTextID;
- TCHAR *stText;
- TCHAR *stValueText;
- DWORD dwFlags;
- DWORD dwColor; // Color (InvAA)(RR)(GG)(BB)
- DWORD dwShadow; //ToDo: Color2/Shaddow
- int iLeft, iTop, iRight, iBottom;
- BYTE RelativeFlags;
- char *szFontID;
- HFONT hFont;
- char *szObjectName;
+ char *szGlyphTextID;
+ wchar_t *stText;
+ wchar_t *stValueText;
+ DWORD dwFlags;
+ DWORD dwColor; // Color (InvAA)(RR)(GG)(BB)
+ DWORD dwShadow; //ToDo: Color2/Shaddow
+ int iLeft, iTop, iRight, iBottom;
+ BYTE RelativeFlags;
+ char *szFontID;
+ HFONT hFont;
+ char *szObjectName;
};
/* SKINTEXTDESCRIPTOR opbject descriptor structure */
@@ -157,6 +157,7 @@ struct SKINFONT
/* HELPER FUNCTIONS */
//Paint ObjectID as parent background for frame hwndIn
+#ifdef _WINDOWS
int __inline SkinDrawWindowBack(HWND hwndIn, HDC hdc, RECT * rcClip, char * objectID)
{
SKINDRAWREQUEST rq;
@@ -176,6 +177,7 @@ int __inline SkinDrawWindowBack(HWND hwndIn, HDC hdc, RECT * rcClip, char * obje
///ske_Service_DrawGlyph((WPARAM)&rq,0); //$$$
return CallService(MS_SKIN_DRAWGLYPH,(WPARAM)&rq,0);
}
+#endif
//Register object with predefined style
int __inline CreateGlyphedObjectDefStyle(char * ObjID,BYTE defStyle);
@@ -192,7 +194,8 @@ int __inline CreateGlyphedObject(char * ObjID);
// prm.szObjectID=ObjID;
// return CallService(MS_SKIN_REGISTERDEFOBJECT,(WPARAM)&prm,0);
//}
-static BOOL __inline ScreenToClientRect(HWND hWnd, LPRECT lpRect)
+
+static BOOL __inline ScreenToClientRect(HWND hWnd, RECT *lpRect)
{
BOOL ret;