X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e675101a7fabdeaed5520257bf3dda457f54178..42124e683da03a7a7463ad9e37d15fda575348af:/include/wx/display.h?ds=sidebyside diff --git a/include/wx/display.h b/include/wx/display.h index e31ee3286a..354b95d73c 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 WXDLLIMPEXP_BASE 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 @@ -62,7 +62,7 @@ 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