From b536b4fce251b1a08e572b4824d13c39e76df255 Mon Sep 17 00:00:00 2001
From: "KJK::Hyperion" <hackbunny@reactos.org>
Date: Wed, 17 Dec 2003 01:39:21 +0000
Subject: [PATCH] Some changes to UxTheme to make it compile with GCC

svn path=/trunk/; revision=7093
---
 reactos/lib/uxtheme/makefile         | 4 ++--
 reactos/lib/uxtheme/nostyle/button.c | 8 ++++----
 reactos/lib/uxtheme/uxthemedll.h     | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/reactos/lib/uxtheme/makefile b/reactos/lib/uxtheme/makefile
index ecd2fea0614..38c88faaa03 100644
--- a/reactos/lib/uxtheme/makefile
+++ b/reactos/lib/uxtheme/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.2 2003/10/25 00:46:01 hyperion Exp $
+# $Id: makefile,v 1.3 2003/12/17 01:39:21 hyperion Exp $
 
 PATH_TO_TOP = ../..
 
@@ -12,7 +12,7 @@ TARGET_SDKLIBS = kernel32.a user32.a gdi32.a
 
 TARGET_CFLAGS = -Wall -Werror -D_DISABLE_TIDENTS -D__USE_W32API -I./include
 
-TARGET_LFLAGS = -nostartfiles --enable-stdcall-fixup
+TARGET_LFLAGS = -nostartfiles -Wl,--enable-stdcall-fixup
 
 TARGET_BASE = 0x5B180000
 
diff --git a/reactos/lib/uxtheme/nostyle/button.c b/reactos/lib/uxtheme/nostyle/button.c
index 82bf4b367d8..78205c02737 100644
--- a/reactos/lib/uxtheme/nostyle/button.c
+++ b/reactos/lib/uxtheme/nostyle/button.c
@@ -44,9 +44,9 @@ STDAPI_(BOOL) Button_IsPartDefined
 
 const UXTHEME_VTABLE Button_Vt =
 {
- (void *)Button_DrawBackground, /* why (void *)? because GCC is stupid */
- (void *)Button_DrawText,
- (void *)Button_GetBackgroundContentRect
+ Button_DrawBackground,
+ Button_DrawText,
+ Button_GetBackgroundContentRect
 };
 
 /*
@@ -201,7 +201,7 @@ STDAPI_(BOOL) Button_TextGrayed
  IN DWORD dwTextFlags2
 )
 {
- if(dwTextFlags2 & DTT_GRAYED == DTT_GRAYED) return TRUE;
+ if((dwTextFlags2 & DTT_GRAYED) == DTT_GRAYED) return TRUE;
 
  switch(iPartId)
  {
diff --git a/reactos/lib/uxtheme/uxthemedll.h b/reactos/lib/uxtheme/uxthemedll.h
index 30ef8f79451..a78f6670011 100644
--- a/reactos/lib/uxtheme/uxthemedll.h
+++ b/reactos/lib/uxtheme/uxthemedll.h
@@ -17,7 +17,7 @@ struct UXTHEME_VTABLE_;
 
 struct UXTHEME_VTABLE_
 {
- HRESULT STDAPICALLTYPE (* p_DrawBackground)
+ HRESULT (STDAPICALLTYPE * p_DrawBackground)
  (
   IN OUT struct UXTHEME_DATA_ * pData,
   IN HDC hdc,
@@ -27,7 +27,7 @@ struct UXTHEME_VTABLE_
   IN const RECT * pClipRect
  );
 
- HRESULT STDAPICALLTYPE (* p_DrawText)
+ HRESULT (STDAPICALLTYPE * p_DrawText)
  (
   IN OUT struct UXTHEME_DATA_ * pData,
   IN HDC hdc,
@@ -40,7 +40,7 @@ struct UXTHEME_VTABLE_
   IN const RECT * pRect
  );
 
- HRESULT STDAPICALLTYPE (* p_GetBackgroundContentRect)
+ HRESULT (STDAPICALLTYPE * p_GetBackgroundContentRect)
  (
   IN OUT struct UXTHEME_DATA_ * pData,
   IN HDC hdc,