X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae3c17b4013e80b99976c750c19fca47729517f6..424c9ce771d938db96d41135ba402a3a1134fa65:/interface/wx/dc.h?ds=inline

diff --git a/interface/wx/dc.h b/interface/wx/dc.h
index 107cc06058..aace4a77c2 100644
--- a/interface/wx/dc.h
+++ b/interface/wx/dc.h
@@ -8,7 +8,6 @@
 
 /**
     @class wxDC
-    @wxheader{dc.h}
 
     A wxDC is a @e "device context" onto which graphics and text can be drawn.
     It is intended to represent different output devices and offers a common
@@ -160,27 +159,27 @@ public:
 
     /**
         Convert device X coordinate to logical coordinate, using the current
-        mapping mode.
+        mapping mode, user scale factor, device origin and axis orientation.
     */
     virtual wxCoord DeviceToLogicalX(wxCoord x);
 
     /**
         Convert device X coordinate to relative logical coordinate, using the
-        current mapping mode but ignoring the x axis orientation. Use this
-        function for converting a width, for example.
+        current mapping mode and user scale factor but ignoring the
+        axis orientation. Use this for converting a width, for example.
     */
     virtual wxCoord DeviceToLogicalXRel(wxCoord x);
 
     /**
         Converts device Y coordinate to logical coordinate, using the current
-        mapping mode.
+        mapping mode, user scale factor, device origin and axis orientation.
     */
     virtual wxCoord DeviceToLogicalY(wxCoord y);
 
     /**
         Convert device Y coordinate to relative logical coordinate, using the
-        current mapping mode but ignoring the y axis orientation. Use this
-        function for converting a height, for example.
+        current mapping mode and user scale factor but ignoring the
+        axis orientation. Use this for converting a height, for example.
     */
     virtual wxCoord DeviceToLogicalYRel(wxCoord y);
 
@@ -446,10 +445,8 @@ public:
         the string. See GetTextExtent() for how to get the dimensions of a text
         string, which can be used to position the text more precisely.
 
-        @note Under wxGTK, the current
-              @ref GetLogicalFunction() "logical function" is used by this
-              function but it is ignored by wxMSW. Thus, you should avoid using
-              logical functions with this function in portable programs.
+        @note The current @ref GetLogicalFunction() "logical function" is 
+              ignored by this function.
     */
     void DrawText(const wxString& text, wxCoord x, wxCoord y);
 
@@ -767,27 +764,27 @@ public:
 
     /**
         Converts logical X coordinate to device coordinate, using the current
-        mapping mode.
+        mapping mode, user scale factor, device origin and axis orientation.
     */
     virtual wxCoord LogicalToDeviceX(wxCoord x);
 
     /**
         Converts logical X coordinate to relative device coordinate, using the
-        current mapping mode but ignoring the x axis orientation. Use this for
-        converting a width, for example.
+        current mapping mode and user scale factor but ignoring the
+        axis orientation. Use this for converting a width, for example.
     */
     virtual wxCoord LogicalToDeviceXRel(wxCoord x);
 
     /**
         Converts logical Y coordinate to device coordinate, using the current
-        mapping mode.
+        mapping mode, user scale factor, device origin and axis orientation.
     */
     virtual wxCoord LogicalToDeviceY(wxCoord y);
 
     /**
         Converts logical Y coordinate to relative device coordinate, using the
-        current mapping mode but ignoring the y axis orientation. Use this for
-        converting a height, for example.
+        current mapping mode and user scale factor but ignoring the
+        axis orientation. Use this for converting a height, for example.
     */
     virtual wxCoord LogicalToDeviceYRel(wxCoord y);
 
@@ -912,6 +909,7 @@ public:
         determines how a source pixel (from a pen or brush colour, or source
         device context if using Blit()) combines with a destination pixel in
         the current device context.
+        Text drawing is not affected by this function.
 
         The possible values and their meaning in terms of source and
         destination pixel values are as follows:
@@ -1101,7 +1099,6 @@ public:
 
 /**
     @class wxDCClipper
-    @wxheader{dc.h}
 
     wxDCClipper is a small helper class for setting a clipping region on a wxDC
     and unsetting it automatically. An object of wxDCClipper class is typically