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

document that text drawing is not affected by the current logical function and update the sample to not imply that it is (#9842)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-21 21:14:58 +00:00
parent 08de440369
commit e928566f7d
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
interface/wx/dc.h
View File

@@ -445,10 +445,8 @@ public:
the string. See GetTextExtent() for how to get the dimensions of a text the string. See GetTextExtent() for how to get the dimensions of a text
string, which can be used to position the text more precisely. string, which can be used to position the text more precisely.
@note Under wxGTK, the current @note The current @ref GetLogicalFunction() "logical function" is
@ref GetLogicalFunction() "logical function" is used by this ignored by this function.
function but it is ignored by wxMSW. Thus, you should avoid using
logical functions with this function in portable programs.
*/ */
void DrawText(const wxString& text, wxCoord x, wxCoord y); void DrawText(const wxString& text, wxCoord x, wxCoord y);
@@ -911,6 +909,7 @@ public:
determines how a source pixel (from a pen or brush colour, or source determines how a source pixel (from a pen or brush colour, or source
device context if using Blit()) combines with a destination pixel in device context if using Blit()) combines with a destination pixel in
the current device context. the current device context.
Text drawing is not affected by this function.
The possible values and their meaning in terms of source and The possible values and their meaning in terms of source and
destination pixel values are as follows: destination pixel values are as follows:

10
samples/drawing/drawing.cpp
View File

@@ -811,20 +811,20 @@ void MyCanvas::DrawText(wxDC& dc)
// test the logical function effect // test the logical function effect
wxCoord y = 150; wxCoord y = 150;
dc.SetLogicalFunction(wxINVERT); dc.SetLogicalFunction(wxINVERT);
dc.DrawText( _T("There should be no text below"), 110, 150 ); // text drawing should ignore logical function
dc.DrawText( _T("There should be a text below"), 110, 150 );
dc.DrawRectangle( 110, y, 100, height ); dc.DrawRectangle( 110, y, 100, height );
// twice drawn inverted should result in invisible
y += height; y += height;
dc.DrawText( _T("Invisible text"), 110, y ); dc.DrawText( _T("Visible text"), 110, y );
dc.DrawRectangle( 110, y, 100, height ); dc.DrawRectangle( 110, y, 100, height );
dc.DrawText( _T("Invisible text"), 110, y ); dc.DrawText( _T("Visible text"), 110, y );
dc.DrawRectangle( 110, y, 100, height ); dc.DrawRectangle( 110, y, 100, height );
dc.SetLogicalFunction(wxCOPY); dc.SetLogicalFunction(wxCOPY);
y += height; y += height;
dc.DrawRectangle( 110, y, 100, height ); dc.DrawRectangle( 110, y, 100, height );
dc.DrawText( _T("Visible text"), 110, y ); dc.DrawText( _T("Another visible text"), 110, y );
} }
static const struct static const struct