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

supporting native background color on wxWindow descendants that are not themselves native controls, like eg wxPanel , see #13032

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-06-06 02:28:56 +00:00
parent 776036d671
commit d4a4ef9074
1 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -802,12 +802,31 @@ void wxOSX_drawRect(NSView* self, SEL _cmd, NSRect rect)
// [NSWindow setAllowsConcurrentViewDrawing:NO] does not affect it. // [NSWindow setAllowsConcurrentViewDrawing:NO] does not affect it.
if ( !wxThread::IsMain() ) if ( !wxThread::IsMain() )
{ {
// just call the superclass handler, we don't need any custom wx drawing if ( impl->IsUserPane() )
// here and it seems to work fine: {
wxOSX_DrawRectHandlerPtr wxWindow* win = impl->GetWXPeer();
superimpl = (wxOSX_DrawRectHandlerPtr) if ( win->UseBgCol() )
[[self superclass] instanceMethodForSelector:_cmd]; {
superimpl(self, _cmd, rect);
CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
CGContextSaveGState( context );
CGContextSetFillColorWithColor( context, win->GetBackgroundColour().GetCGColor());
CGContextFillRect( context, NSRectToCGRect(rect) );
CGContextRestoreGState( context );
}
}
else
{
// just call the superclass handler, we don't need any custom wx drawing
// here and it seems to work fine:
wxOSX_DrawRectHandlerPtr
superimpl = (wxOSX_DrawRectHandlerPtr)
[[self superclass] instanceMethodForSelector:_cmd];
superimpl(self, _cmd, rect);
}
return; return;
} }
#endif // wxUSE_THREADS #endif // wxUSE_THREADS