Removed SetPropertiesFlag() (high-level function using 'undocumented' wxPGProperty...

[wxWidgets.git] / interface / wx / gdicmn.h

diff --git a/interface/wx/gdicmn.h b/interface/wx/gdicmn.h
index f415ecf9d81259c728e1b0179d9baa595bec6040..188ad9382cd63d6d6175b07998bc16c5b3c2ceee 100644 (file)
--- a/interface/wx/gdicmn.h
+++ b/interface/wx/gdicmn.h
@@ -94,7 +94,6 @@ enum wxStockCursor
 
 /**
     @class wxRealPoint
-    @wxheader{gdicmn.h}
 
     A wxRealPoint is a useful data structure for graphics operations.
 
@@ -131,7 +130,6 @@ public:
 
 /**
     @class wxRect
-    @wxheader{gdicmn.h}
 
     A class for manipulating rectangles.
 
@@ -436,7 +434,6 @@ public:
 
 /**
     @class wxPoint
-    @wxheader{gdicmn.h}
 
     A wxPoint is a useful data structure for graphics operations.
 
@@ -503,7 +500,6 @@ wxPoint wxDefaultPosition;
 
 /**
     @class wxColourDatabase
-    @wxheader{gdicmn.h}
 
     wxWidgets maintains a database of standard RGB colours for a predefined
     set of named colours. The application may add to this set if desired by
@@ -616,7 +612,7 @@ public:
         is, wxColour::IsOk() will return @false) if the colour wasn't found in
         the database.
     */
-    wxColour Find(const wxString& colourName);
+    wxColour Find(const wxString& colourName) const;
 
     /**
         Finds a colour name given the colour. Returns an empty string if the
@@ -628,7 +624,6 @@ public:
 
 /**
     @class wxSize
-    @wxheader{gdicmn.h}
 
     A wxSize is a useful data structure for graphics operations. It simply
     contains integer @e width and @e height members.
@@ -857,11 +852,29 @@ void wxClientDisplayRect(int* x, int* y, int* width, int* height);
 wxRect wxGetClientDisplayRect();
 //@}
 
+/** @ingroup group_funcmacro_gdi */
+//@{
+/**
+    Returns the display resolution in pixels per inch.
+
+    The @c x component of the returned wxSize object contains the horizontal
+    resolution and the @c y one -- the vertical resolution.
+
+    @header{wx/gdicmn.h}
+
+    @since 2.9.0
+*/
+wxSize wxGetDisplayPPI();
+//@}
+
 /** @ingroup group_funcmacro_gdi */
 //@{
 /**
     Returns the display size in pixels.
 
+    For the version taking @a width and @a header arguments, either of them
+    can be @NULL if the caller is not interested in the returned value.
+
     @header{wx/gdicmn.h}
 */
 void wxDisplaySize(int* width, int* height);
@@ -873,6 +886,11 @@ wxSize wxGetDisplaySize();
 /**
     Returns the display size in millimeters.
 
+    For the version taking @a width and @a header arguments, either of them
+    can be @NULL if the caller is not interested in the returned value.
+
+    @see wxGetDisplayPPI()
+
     @header{wx/gdicmn.h}
 */
 void wxDisplaySizeMM(int* width, int* height);