X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d5b6a403ec7adae6bef61d84940b33b6f070116..8e5ec129614e2473fd240f2a6e94ee56e3a9039b:/src/unix/displayx11.cpp?ds=sidebyside diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp index 9c17ef7d28..1d71c7f038 100644 --- a/src/unix/displayx11.cpp +++ b/src/unix/displayx11.cpp @@ -21,22 +21,23 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_DISPLAY + #include "wx/display.h" -#include "wx/display_impl.h" -#include "wx/intl.h" -#include "wx/log.h" #ifndef WX_PRECOMP - #include "wx/dynarray.h" - #include "wx/gdicmn.h" - #include "wx/string.h" - #include "wx/utils.h" + #include "wx/dynarray.h" + #include "wx/gdicmn.h" + #include "wx/string.h" + #include "wx/utils.h" + #include "wx/intl.h" + #include "wx/log.h" #endif /* WX_PRECOMP */ -#if wxUSE_DISPLAY +#include "wx/display_impl.h" /* These must be included after the wx files. Otherwise the Data macro in * Xlibint.h conflicts with a function declaration in wx/list.h. */ @@ -107,7 +108,7 @@ private: class wxDisplayFactoryX11 : public wxDisplayFactory { public: - wxDisplayFactoryX11(); + wxDisplayFactoryX11() { } virtual wxDisplayImpl *CreateDisplay(size_t n); virtual size_t GetCount();