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

supporting text foreground color, fixes #11903

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2010-04-06 21:17:59 +00:00
parent 24e6777949
commit 1a289c624b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osx/cocoa/window.mm
View File

@@ -131,6 +131,7 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
- (void)setAction:(SEL)aSelector; - (void)setAction:(SEL)aSelector;
- (void)setDoubleAction:(SEL)aSelector; - (void)setDoubleAction:(SEL)aSelector;
- (void)setBackgroundColor:(NSColor*)aColor; - (void)setBackgroundColor:(NSColor*)aColor;
- (void)setTextColor:(NSColor *)color;
- (void)setImagePosition:(NSCellImagePosition)aPosition; - (void)setImagePosition:(NSCellImagePosition)aPosition;
@end @end
@@ -1888,10 +1889,15 @@ void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant )
} }
} }
void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&, long, bool) void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&col, long, bool)
{ {
if ([m_osxView respondsToSelector:@selector(setFont:)]) if ([m_osxView respondsToSelector:@selector(setFont:)])
[m_osxView setFont: font.OSXGetNSFont()]; [m_osxView setFont: font.OSXGetNSFont()];
if ([m_osxView respondsToSelector:@selector(setTextColor:)])
[m_osxView setTextColor:[NSColor colorWithCalibratedRed:(CGFloat) (col.Red() / 255.0)
green:(CGFloat) (col.Green() / 255.0)
blue:(CGFloat) (col.Blue() / 255.0)
alpha:(CGFloat) (col.Alpha() / 255.0)]];
} }
void wxWidgetCocoaImpl::SetToolTip(wxToolTip* tooltip) void wxWidgetCocoaImpl::SetToolTip(wxToolTip* tooltip)