Don't include <CoreFoundation/CFBase.h> because it in turn includes MacTypes.h which...

[wxWidgets.git] / include / wx / display.h

diff --git a/include/wx/display.h b/include/wx/display.h
index 3429258eb6fc2b04ff38645fb17a25e1dfea04ad..eea6bbb7f6495d1d579ff86c297ad52d43bf06c7 100644 (file)
--- a/include/wx/display.h
+++ b/include/wx/display.h
@@ -28,7 +28,7 @@
 class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxPoint;
 class WXDLLEXPORT wxRect;
-class WXDLLEXPORT wxString;
+class WXDLLIMPEXP_BASE wxString;
 
 class WXDLLEXPORT wxDisplayFactory;
 class WXDLLEXPORT wxDisplayImpl;
@@ -45,7 +45,7 @@ public:
     //
     // the displays are numbered from 0 to GetCount() - 1, 0 is always the
     // primary display and the only one which is always supported
-    wxDisplay(size_t n = 0);
+    wxDisplay(unsigned n = 0);
 
     // dtor is not virtual as this is a concrete class not meant to be derived
     // from
@@ -54,7 +54,7 @@ public:
 
     // return the number of available displays, valid parameters to
     // wxDisplay ctor are from 0 up to this number
-    static size_t GetCount();
+    static unsigned GetCount();
 
     // find the display where the given point lies, return wxNOT_FOUND if
     // it doesn't belong to any display
@@ -62,15 +62,18 @@ public:
 
     // find the display where the given window lies, return wxNOT_FOUND if it
     // is not shown at all
-    static int GetFromWindow(wxWindow *window);
+    static int GetFromWindow(const wxWindow *window);
 
 
     // return true if the object was initialized successfully
     bool IsOk() const { return m_impl != NULL; }
 
-    // get the display size
+    // get the full display size
     wxRect GetGeometry() const;
 
+    // get the client area of the display, i.e. without taskbars and such
+    wxRect GetClientArea() const;
+
     // name may be empty
     wxString GetName() const;