From 38665e99c190baf4283620a035331510fd99e922 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 5 May 2005 15:56:34 +0000 Subject: [PATCH] Removed non-theme related defs git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@33960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/uxtheme.h | 237 ++++++++++++--------------------------- src/msw/uxtheme.cpp | 6 +- 2 files changed, 72 insertions(+), 171 deletions(-) diff --git a/include/wx/msw/uxtheme.h b/include/wx/msw/uxtheme.h index 25c72476fa..f14a81f167 100644 --- a/include/wx/msw/uxtheme.h +++ b/include/wx/msw/uxtheme.h @@ -19,112 +19,36 @@ // Use wxModule approach to initialization. #define WXU_USE_WXMODULE 1 -#if wxUSE_UNICODE -typedef struct _WXUOSVERSIONINFOEXW { - WXDWORD dwOSVersionInfoSize; - WXDWORD dwMajorVersion; - WXDWORD dwMinorVersion; - WXDWORD dwBuildNumber; - WXDWORD dwPlatformId; - wchar_t szCSDVersion[ 128 ]; // Maintenance string for PSS usage - unsigned short wServicePackMajor; - unsigned short wServicePackMinor; - unsigned short wSuiteMask; - unsigned char wProductType; - unsigned char wReserved; -} WXUOSVERSIONINFOEXW, *PWXUOSVERSIONINFOEXW, *LPWXUOSVERSIONINFOEXW; -#define WXUOSVERSIONINFOEX WXUOSVERSIONINFOEXW -#define PWXUOSVERSIONINFOEX PWXUOSVERSIONINFOEXW -#define LPWXUOSVERSIONINFOEX LPWXUOSVERSIONINFOEXW -#else -typedef struct _WXUOSVERSIONINFOEXA { - WXDWORD dwOSVersionInfoSize; - WXDWORD dwMajorVersion; - WXDWORD dwMinorVersion; - WXDWORD dwBuildNumber; - WXDWORD dwPlatformId; - char szCSDVersion [128]; // Maintenance string for PSS usage - unsigned short wServicePackMajor; - unsigned short wServicePackMinor; - unsigned short wSuiteMask; - unsigned char wProductType; - unsigned char wReserved; -} WXUOSVERSIONINFOEXA, *PWXUOSVERSIONINFOEXA, *LPWXUOSVERSIONINFOEXA; -#define WXUOSVERSIONINFOEX WXUOSVERSIONINFOEXA -#define PWXUOSVERSIONINFOEX PWXUOSVERSIONINFOEXA -#define LPWXUOSVERSIONINFOEX LPWXUOSVERSIONINFOEXA -#endif - -typedef int WXUBOOL ; - -typedef struct tagWXURECT -{ - long left; - long top; - long right; - long bottom; -} WXURECT ; - typedef void* WXHTHEME; typedef long WXUHRESULT; -typedef WXHTHEME (__stdcall *PFNWXUOPENTHEMEDATA)(WXHWND, const wchar_t *) ; -typedef WXUHRESULT (__stdcall *PFNWXUCLOSETHEMEDATA)(WXHTHEME) ; -typedef WXUHRESULT (__stdcall *PFNWXUDRAWTHEMEBACKGROUND)(WXHTHEME, WXHDC, - int, int, const WXURECT *, const WXURECT *) ; +typedef WXHTHEME (__stdcall *PFNWXUOPENTHEMEDATA)(WXHWND, const wchar_t *); +typedef WXUHRESULT (__stdcall *PFNWXUCLOSETHEMEDATA)(WXHTHEME); +typedef WXUHRESULT (__stdcall *PFNWXUDRAWTHEMEBACKGROUND)(WXHTHEME, WXHDC, + int, int, const RECT *, const RECT *); #define WXU_DTT_GRAYED 0x1 -typedef WXUHRESULT (__stdcall *PFNWXUDRAWTHEMETEXT)(WXHTHEME, WXHDC, int, - int, const wchar_t *, int, DWORD, - DWORD, const WXURECT *) ; -typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEBACKGROUNDCONTENTRECT)(WXHTHEME, WXHDC, - int, int, const WXURECT *, WXURECT *) ; -typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEBACKGROUNDEXTENT)(WXHTHEME, WXHDC, int, int, - const WXURECT *, WXURECT *) ; +typedef WXUHRESULT (__stdcall *PFNWXUDRAWTHEMETEXT)(WXHTHEME, WXHDC, int, + int, const wchar_t *, int, DWORD, + DWORD, const RECT *); +typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEBACKGROUNDCONTENTRECT)(WXHTHEME, WXHDC, + int, int, const RECT *, RECT *); +typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEBACKGROUNDEXTENT)(WXHTHEME, WXHDC, int, int, + const RECT *, RECT *); enum WXUTHEMESIZE { - WXU_TS_MIN, // minimum size - WXU_TS_TRUE, // size without stretching - WXU_TS_DRAW // size that theme mgr will use to draw part + WXU_TS_MIN, + WXU_TS_TRUE, + WXU_TS_DRAW }; -typedef struct tagWXUSIZE -{ - long cx; - long cy; -} WXUSIZE ; - -typedef struct tagWXUTEXTMETRIC -{ - long tmHeight; - long tmAscent; - long tmDescent; - long tmInternalLeading; - long tmExternalLeading; - long tmAveCharWidth; - long tmMaxCharWidth; - long tmWeight; - long tmOverhang; - long tmDigitizedAspectX; - long tmDigitizedAspectY; - wchar_t tmFirstChar; - wchar_t tmLastChar; - wchar_t tmDefaultChar; - wchar_t tmBreakChar; - unsigned char tmItalic; - unsigned char tmUnderlined; - unsigned char tmStruckOut; - unsigned char tmPitchAndFamily; - unsigned char tmCharSet; -} WXUTEXTMETRIC; - -typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEPARTSIZE)(WXHTHEME, WXHDC, int, int, const WXURECT *, - enum WXUTHEMESIZE, WXUSIZE *) ; -typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMETEXTEXTENT)(WXHTHEME, WXHDC, int, int, const wchar_t *, - int, WXDWORD, const WXURECT *, WXURECT *) ; +typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEPARTSIZE)(WXHTHEME, WXHDC, int, int, const RECT *, + enum WXUTHEMESIZE, SIZE *); +typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMETEXTEXTENT)(WXHTHEME, WXHDC, int, int, const wchar_t *, + int, WXDWORD, const RECT *, RECT *); typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMETEXTMETRICS)(WXHTHEME, WXHDC, - int, int, WXUTEXTMETRIC*); + int, int, TEXTMETRIC*); typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEBACKGROUNDREGION)(WXHTHEME, WXHDC, - int, int, const WXURECT *, WXHRGN *) ; + int, int, const RECT *, WXHRGN *); #define WXU_HTTB_BACKGROUNDSEG 0x0000 #define WXU_HTTB_FIXEDBORDER 0x0002 @@ -137,108 +61,85 @@ typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEBACKGROUNDREGION)(WXHTHEME, WXHDC, #define WXU_HTTB_SIZINGTEMPLATE 0x0100 #define WXU_HTTB_SYSTEMSIZINGMARGINS 0x0200 -typedef struct tagWXUPOINT -{ - long x; - long y; -} WXUPOINT ; - typedef WXUHRESULT (__stdcall *PFNWXUHITTESTTHEMEBACKGROUND)(WXHTHEME, WXHDC, int, - int, WXDWORD, const WXURECT *, WXHRGN, - WXUPOINT, unsigned short *) ; + int, WXDWORD, const RECT *, WXHRGN, + POINT, unsigned short *); typedef WXUHRESULT (__stdcall *PFNWXUDRAWTHEMEEDGE)(WXHTHEME, WXHDC, int, int, - const WXURECT *, unsigned int, unsigned int, WXURECT *); + const RECT *, unsigned int, unsigned int, RECT *); typedef WXUHRESULT (__stdcall *PFNWXUDRAWTHEMEICON)(WXHTHEME, WXHDC, int, int, - const WXURECT *, WXHIMAGELIST, int) ; -typedef WXUBOOL (__stdcall *PFNWXUISTHEMEPARTDEFINED)(WXHTHEME, int, int) ; -typedef WXUBOOL (__stdcall *PFNWXUISTHEMEBACKGROUNDPARTIALLYTRANSPARENT)(WXHTHEME, int, int) ; -typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMECOLOR)(WXHTHEME, int, int, int, WXCOLORREF*) ; + const RECT *, WXHIMAGELIST, int); +typedef BOOL (__stdcall *PFNWXUISTHEMEPARTDEFINED)(WXHTHEME, int, int); +typedef BOOL (__stdcall *PFNWXUISTHEMEBACKGROUNDPARTIALLYTRANSPARENT)(WXHTHEME, int, int); +typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMECOLOR)(WXHTHEME, int, int, int, WXCOLORREF*); typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEMETRIC)(WXHTHEME, WXHDC, int, - int, int, int *) ; + int, int, int *); typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMESTRING)(WXHTHEME, int, - int, int, wchar_t *, int) ; -typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEBOOL)(WXHTHEME, int, int, int, WXUBOOL *) ; -typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEINT)(WXHTHEME, int, int, int, int *) ; -typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEENUMVALUE)(WXHTHEME, int, int, int, int *) ; -typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEPOSITION)(WXHTHEME, int, int, int, WXUPOINT *) ; -typedef struct tagWXULOGFONT -{ - long lfHeight; - long lfWidth; - long lfEscapement; - long lfOrientation; - long lfWeight; - unsigned char lfItalic; - unsigned char lfUnderline; - unsigned char lfStrikeOut; - unsigned char lfCharSet; - unsigned char lfOutPrecision; - unsigned char lfClipPrecision; - unsigned char lfQuality; - unsigned char lfPitchAndFamily; - wchar_t lfFaceName[32]; -} WXULOGFONT ; -typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEFONT)(WXHTHEME, WXHDC, int, int, int, WXULOGFONT *) ; -typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMERECT)(WXHTHEME, int, int, int, WXURECT *) ; + int, int, wchar_t *, int); +typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEBOOL)(WXHTHEME, int, int, int, BOOL *); +typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEINT)(WXHTHEME, int, int, int, int *); +typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEENUMVALUE)(WXHTHEME, int, int, int, int *); +typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEPOSITION)(WXHTHEME, int, int, int, POINT *); +typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEFONT)(WXHTHEME, WXHDC, int, int, int, LOGFONT *); +typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMERECT)(WXHTHEME, int, int, int, RECT *); typedef struct _WXUMARGINS { - int cxLeftWidth; // width of left border that retains its size - int cxRightWidth; // width of right border that retains its size - int cyTopHeight; // height of top border that retains its size - int cyBottomHeight; // height of bottom border that retains its size + int cxLeftWidth; + int cxRightWidth; + int cyTopHeight; + int cyBottomHeight; } WXUMARGINS, *PWXUMARGINS; typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEMARGINS)(WXHTHEME, WXHDC, int, - int, int, WXURECT *, WXUMARGINS *) ; + int, int, RECT *, WXUMARGINS *); #define WXU_MAX_INTLIST_COUNT 10 typedef struct _WXUINTLIST { - int iValueCount; // number of values in iValues + int iValueCount; int iValues[WXU_MAX_INTLIST_COUNT]; } WXUINTLIST, *PWXUINTLIST; typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEINTLIST)(WXHTHEME, int, - int, int, WXUINTLIST*) ; + int, int, WXUINTLIST*); enum WXUPROPERTYORIGIN { - WXU_PO_STATE, // property was found in the state section - WXU_PO_PART, // property was found in the part section - WXU_PO_CLASS, // property was found in the class section - WXU_PO_GLOBAL, // property was found in [globals] section - WXU_PO_NOTFOUND // property was not found + WXU_PO_STATE, + WXU_PO_PART, + WXU_PO_CLASS, + WXU_PO_GLOBAL, + WXU_PO_NOTFOUND }; typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEPROPERTYORIGIN)(WXHTHEME, int, - int, int, enum WXUPROPERTYORIGIN *) ; -typedef WXUHRESULT (__stdcall *PFNWXUSETWINDOWTHEME)(WXHWND, const wchar_t*, const wchar_t *) ; -typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEFILENAME)(WXHTHEME, int, int, int, wchar_t *, int) ; -typedef WXCOLORREF (__stdcall *PFNWXUGETTHEMESYSCOLOR)(WXHTHEME, int) ; -typedef WXHBRUSH (__stdcall *PFNWXUGETTHEMESYSCOLORBRUSH)(WXHTHEME, int) ; -typedef WXUBOOL (__stdcall *PFNWXUGETTHEMESYSBOOL)(WXHTHEME, int) ; -typedef int (__stdcall *PFNWXUGETTHEMESYSSIZE)(WXHTHEME, int) ; -typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMESYSFONT)(WXHTHEME, int, WXULOGFONT *) ; -typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMESYSSTRING)(WXHTHEME, int, wchar_t *, int) ; -typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMESYSINT)(WXHTHEME, int, int *) ; -typedef WXUBOOL (__stdcall *PFNWXUISTHEMEACTIVE)() ; -typedef WXUBOOL (__stdcall *PFNWXUISAPPTHEMED)() ; -typedef WXHTHEME (__stdcall *PFNWXUGETWINDOWTHEME)(WXHWND) ; + int, int, enum WXUPROPERTYORIGIN *); +typedef WXUHRESULT (__stdcall *PFNWXUSETWINDOWTHEME)(WXHWND, const wchar_t*, const wchar_t *); +typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEFILENAME)(WXHTHEME, int, int, int, wchar_t *, int); +typedef WXCOLORREF (__stdcall *PFNWXUGETTHEMESYSCOLOR)(WXHTHEME, int); +typedef WXHBRUSH (__stdcall *PFNWXUGETTHEMESYSCOLORBRUSH)(WXHTHEME, int); +typedef BOOL (__stdcall *PFNWXUGETTHEMESYSBOOL)(WXHTHEME, int); +typedef int (__stdcall *PFNWXUGETTHEMESYSSIZE)(WXHTHEME, int); +typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMESYSFONT)(WXHTHEME, int, LOGFONT *); +typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMESYSSTRING)(WXHTHEME, int, wchar_t *, int); +typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMESYSINT)(WXHTHEME, int, int *); +typedef BOOL (__stdcall *PFNWXUISTHEMEACTIVE)(); +typedef BOOL (__stdcall *PFNWXUISAPPTHEMED)(); +typedef WXHTHEME (__stdcall *PFNWXUGETWINDOWTHEME)(WXHWND); #define WXU_ETDT_DISABLE 0x00000001 #define WXU_ETDT_ENABLE 0x00000002 #define WXU_ETDT_USETABTEXTURE 0x00000004 #define WXU_ETDT_ENABLETAB 0x00000006 -typedef WXUHRESULT (__stdcall *PFNWXUENABLETHEMEDIALOGTEXTURE)(WXHWND, WXDWORD) ; -typedef WXUBOOL (__stdcall *PFNWXUISTHEMEDIALOGTEXTUREENABLED)(WXHWND) ; +typedef WXUHRESULT (__stdcall *PFNWXUENABLETHEMEDIALOGTEXTURE)(WXHWND, WXDWORD); +typedef BOOL (__stdcall *PFNWXUISTHEMEDIALOGTEXTUREENABLED)(WXHWND); #define WXU_STAP_ALLOW_NONCLIENT 1 #define WXU_STAP_ALLOW_CONTROLS 2 #define WXU_STAP_ALLOW_WEBCONTENT 4 -typedef WXDWORD (__stdcall *PFNWXUGETTHEMEAPPPROPERTIES)() ; -typedef void (__stdcall *PFNWXUSETTHEMEAPPPROPERTIES)(WXDWORD) ; -typedef WXUHRESULT (__stdcall *PFNWXUGETCURRENTTHEMENAME)(wchar_t *, int, - wchar_t *, int, wchar_t *, int) ; +typedef WXDWORD (__stdcall *PFNWXUGETTHEMEAPPPROPERTIES)(); +typedef void (__stdcall *PFNWXUSETTHEMEAPPPROPERTIES)(WXDWORD); +typedef WXUHRESULT (__stdcall *PFNWXUGETCURRENTTHEMENAME)(wchar_t *, int, + wchar_t *, int, wchar_t *, int); #define WXU_SZ_THDOCPROP_DISPLAYNAME L"DisplayName" #define WXU_SZ_THDOCPROP_CANONICALNAME L"ThemeName" @@ -246,9 +147,9 @@ typedef WXUHRESULT (__stdcall *PFNWXUGETCURRENTTHEMENAME)(wchar_t *, int, #define WXU_SZ_THDOCPROP_AUTHOR L"author" typedef WXUHRESULT (__stdcall *PFNWXUGETTHEMEDOCUMENTATIONPROPERTY)(const wchar_t *, - const wchar_t *, wchar_t *, int) ; -typedef WXUHRESULT (__stdcall *PFNWXUDRAWTHEMEPARENTBACKGROUND)(WXHWND, WXHDC, WXURECT *) ; -typedef WXUHRESULT (__stdcall *PFNWXUENABLETHEMING)(WXUBOOL) ; + const wchar_t *, wchar_t *, int); +typedef WXUHRESULT (__stdcall *PFNWXUDRAWTHEMEPARENTBACKGROUND)(WXHWND, WXHDC, RECT *); +typedef WXUHRESULT (__stdcall *PFNWXUENABLETHEMING)(BOOL); class WXDLLEXPORT wxUxThemeEngine { diff --git a/src/msw/uxtheme.cpp b/src/msw/uxtheme.cpp index 751000bedc..6c5e358bbf 100644 --- a/src/msw/uxtheme.cpp +++ b/src/msw/uxtheme.cpp @@ -49,9 +49,9 @@ wxUxThemeEngine* g_pThemeEngine = ((wxUxThemeEngine*)NULL) ; BOOL wxCanUseInitThemeEngine() { - WXUOSVERSIONINFOEX wxuosex ; - memset((void*)&wxuosex, 0, sizeof(WXUOSVERSIONINFOEX)) ; - wxuosex.dwOSVersionInfoSize = sizeof(WXUOSVERSIONINFOEX) ; + OSVERSIONINFOEX wxuosex ; + memset((void*)&wxuosex, 0, sizeof(OSVERSIONINFOEX)) ; + wxuosex.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX) ; if(!GetVersionEx((LPOSVERSIONINFO)&wxuosex)) { wxuosex.dwOSVersionInfoSize = sizeof(OSVERSIONINFO) ;