X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e675101a7fabdeaed5520257bf3dda457f54178..931d6a47c32a5b4c283243cb553ce71ee2b535d5:/include/wx/display_impl.h diff --git a/include/wx/display_impl.h b/include/wx/display_impl.h index 07eae9a753..b6674ebfad 100644 --- a/include/wx/display_impl.h +++ b/include/wx/display_impl.h @@ -3,7 +3,6 @@ // Purpose: wxDisplayImpl class declaration // Author: Vadim Zeitlin // Created: 2006-03-15 -// RCS-ID: $Id$ // Copyright: (c) 2002-2006 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,7 +16,7 @@ // wxDisplayFactory: allows to create wxDisplay objects // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDisplayFactory +class WXDLLIMPEXP_CORE wxDisplayFactory { public: wxDisplayFactory() { } @@ -37,14 +36,14 @@ public: // return the display for the given window or wxNOT_FOUND // // the window pointer must not be NULL (i.e. caller should check it) - virtual int GetFromWindow(wxWindow *window); + virtual int GetFromWindow(const wxWindow *window); }; // ---------------------------------------------------------------------------- // wxDisplayImpl: base class for all wxDisplay implementations // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDisplayImpl +class WXDLLIMPEXP_CORE wxDisplayImpl { public: // virtual dtor for this base class @@ -89,7 +88,7 @@ protected: friend class wxDisplayFactory; - DECLARE_NO_COPY_CLASS(wxDisplayImpl) + wxDECLARE_NO_COPY_CLASS(wxDisplayImpl); }; // ---------------------------------------------------------------------------- @@ -98,7 +97,7 @@ protected: // this is a stub implementation using single/main display only, it is // available even if wxUSE_DISPLAY == 0 -class WXDLLEXPORT wxDisplayFactorySingle : public wxDisplayFactory +class WXDLLIMPEXP_CORE wxDisplayFactorySingle : public wxDisplayFactory { public: virtual wxDisplayImpl *CreateDisplay(unsigned n);