Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

include fixed for non-precomp

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-03-06 09:44:36 +00:00
parent 33ea583705
commit f88fc76e8f
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/mac/carbon/listctrl_mac.cpp
View File

@@ -30,6 +30,7 @@
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/settings.h"
#endif #endif
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
@@ -2766,9 +2767,9 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
} }
CGContextSaveGState(context); CGContextSaveGState(context);
CGContextSetRGBFillColor(context, (float)backgroundColor.red / (float)USHRT_MAX, CGContextSetRGBFillColor(context, (CGFloat)backgroundColor.red / (CGFloat)USHRT_MAX,
(float)backgroundColor.green / (float)USHRT_MAX, (CGFloat)backgroundColor.green / (CGFloat)USHRT_MAX,
(float)backgroundColor.blue / (float)USHRT_MAX, 1.0); (CGFloat)backgroundColor.blue / (CGFloat)USHRT_MAX, (CGFloat) 1.0);
CGContextFillRect(context, enclosingCGRect); CGContextFillRect(context, enclosingCGRect);
CGContextRestoreGState(context); CGContextRestoreGState(context);
@@ -2786,9 +2787,9 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
bgColor.GetRGBColor(&backgroundColor); bgColor.GetRGBColor(&backgroundColor);
CGContextSaveGState(context); CGContextSaveGState(context);
CGContextSetRGBFillColor(context, (float)backgroundColor.red / (float)USHRT_MAX, CGContextSetRGBFillColor(context, (CGFloat)backgroundColor.red / (CGFloat)USHRT_MAX,
(float)backgroundColor.green / (float)USHRT_MAX, (CGFloat)backgroundColor.green / (CGFloat)USHRT_MAX,
(float)backgroundColor.blue / (float)USHRT_MAX, 1.0); (CGFloat)backgroundColor.blue / (CGFloat)USHRT_MAX, (CGFloat) 1.0);
CGContextFillRect(context, enclosingCGRect); CGContextFillRect(context, enclosingCGRect);
CGContextRestoreGState(context); CGContextRestoreGState(context);
@@ -2870,9 +2871,9 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
info.truncationMaxLines = 1; info.truncationMaxLines = 1;
CGContextSaveGState(context); CGContextSaveGState(context);
CGContextSetRGBFillColor (context, (float)labelColor.red / (float)USHRT_MAX, CGContextSetRGBFillColor (context, (CGFloat)labelColor.red / (CGFloat)USHRT_MAX,
(float)labelColor.green / (float)USHRT_MAX, (CGFloat)labelColor.green / (CGFloat)USHRT_MAX,
(float)labelColor.blue / (float)USHRT_MAX, 1.0); (CGFloat)labelColor.blue / (CGFloat)USHRT_MAX, (CGFloat) 1.0);
HIThemeDrawTextBox(cfString, &textCGRect, &info, context, kHIThemeOrientationNormal); HIThemeDrawTextBox(cfString, &textCGRect, &info, context, kHIThemeOrientationNormal);
@@ -2895,7 +2896,7 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
OSStatus err = errDataBrowserPropertyNotSupported; OSStatus err = errDataBrowserPropertyNotSupported;
wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl ); wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
wxMacListCtrlItem* lcItem; wxMacListCtrlItem* lcItem = NULL;
if (listColumn >= 0) if (listColumn >= 0)
{ {