From 491a5b803e862fcafb89be8e21c95dfbb5a94788 Mon Sep 17 00:00:00 2001 From: "smfr%smfr.org" Date: Sat, 20 Aug 2005 07:14:18 +0000 Subject: [PATCH] Fix bug 279510: remove all the pre-Carbon code and TARGET_CARBON #idfefs from gfx. Patch by Ludovic Hirlimann , r=pink, sr=me git-svn-id: svn://10.0.0.236/trunk@178493 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/widget/src/mac/nsNativeThemeMac.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/mozilla/widget/src/mac/nsNativeThemeMac.cpp b/mozilla/widget/src/mac/nsNativeThemeMac.cpp index 3a255d3d492..fe4db2dbd6d 100644 --- a/mozilla/widget/src/mac/nsNativeThemeMac.cpp +++ b/mozilla/widget/src/mac/nsNativeThemeMac.cpp @@ -201,7 +201,6 @@ printf("told to draw at %ld %ld w %ld h %ld\n", inBoxRect.left, inBoxRect.top, i void nsNativeThemeMac::DrawEditText ( const Rect& inBoxRect, PRBool inIsDisabled ) { -#if TARGET_CARBON Pattern whitePat; ::BackColor(whiteColor); ::BackPat(GetQDGlobalsWhite(&whitePat)); @@ -209,14 +208,12 @@ nsNativeThemeMac::DrawEditText ( const Rect& inBoxRect, PRBool inIsDisabled ) ThemeDrawState drawState = inIsDisabled ? kThemeStateDisabled : kThemeStateActive; ::DrawThemeEditTextFrame(&inBoxRect, drawState); -#endif } void nsNativeThemeMac::DrawListBox ( const Rect& inBoxRect, PRBool inIsDisabled ) { -#if TARGET_CARBON Pattern whitePat; ::BackColor(whiteColor); ::BackPat(GetQDGlobalsWhite(&whitePat)); @@ -224,7 +221,6 @@ nsNativeThemeMac::DrawListBox ( const Rect& inBoxRect, PRBool inIsDisabled ) ThemeDrawState drawState = inIsDisabled ? kThemeStateDisabled : kThemeStateActive; ::DrawThemeListBoxFrame(&inBoxRect, drawState); -#endif } @@ -488,7 +484,6 @@ nsNativeThemeMac::GetWidgetBorder(nsIDeviceContext* aContext, // XXX we should probably cache some of these metrics -#if TARGET_CARBON switch ( aWidgetType ) { case NS_THEME_BUTTON: @@ -525,7 +520,6 @@ nsNativeThemeMac::GetWidgetBorder(nsIDeviceContext* aContext, } } -#endif return NS_OK; } @@ -547,7 +541,6 @@ nsNativeThemeMac::GetMinimumWidgetSize(nsIRenderingContext* aContext, nsIFrame* aResult->SizeTo(0,0); *aIsOverridable = PR_TRUE; -#if TARGET_CARBON switch ( aWidgetType ) { case NS_THEME_BUTTON: @@ -686,7 +679,6 @@ nsNativeThemeMac::GetMinimumWidgetSize(nsIRenderingContext* aContext, nsIFrame* } } -#endif return NS_OK; }