X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef1717a963dfb76bac26b9f4277ae590b3c0a2e6..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/display.h?ds=inline diff --git a/include/wx/display.h b/include/wx/display.h index 3429258eb6..7923e9c687 100644 --- a/include/wx/display.h +++ b/include/wx/display.h @@ -22,22 +22,22 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxVideoMode, wxArrayVideoModes); // default, uninitialized, video mode object - extern WXDLLEXPORT_DATA(const wxVideoMode) wxDefaultVideoMode; + extern WXDLLIMPEXP_DATA_CORE(const wxVideoMode) wxDefaultVideoMode; #endif // wxUSE_DISPLAY -class WXDLLEXPORT wxWindow; -class WXDLLEXPORT wxPoint; -class WXDLLEXPORT wxRect; -class WXDLLEXPORT wxString; +class WXDLLIMPEXP_FWD_CORE wxWindow; +class WXDLLIMPEXP_FWD_CORE wxPoint; +class WXDLLIMPEXP_FWD_CORE wxRect; +class WXDLLIMPEXP_FWD_BASE wxString; -class WXDLLEXPORT wxDisplayFactory; -class WXDLLEXPORT wxDisplayImpl; +class WXDLLIMPEXP_FWD_CORE wxDisplayFactory; +class WXDLLIMPEXP_FWD_CORE wxDisplayImpl; // ---------------------------------------------------------------------------- // wxDisplay: represents a display/monitor attached to the system // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDisplay +class WXDLLIMPEXP_CORE wxDisplay { public: // initialize the object containing all information about the given @@ -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; @@ -119,7 +122,7 @@ private: wxDisplayImpl *m_impl; - DECLARE_NO_COPY_CLASS(wxDisplay) + wxDECLARE_NO_COPY_CLASS(wxDisplay); }; #endif // _WX_DISPLAY_H_BASE_