X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e97251c58ea8b3676ec05ecccdcae77c61e97a10..b6e2eddeaf7e559589ce41ac41e88f9bd71c5a08:/include/wx/display.h diff --git a/include/wx/display.h b/include/wx/display.h index 69835ce6aa..a9eeb86607 100644 --- a/include/wx/display.h +++ b/include/wx/display.h @@ -14,7 +14,7 @@ #if wxUSE_DISPLAY -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "displaybase.h" #endif @@ -143,16 +143,16 @@ protected: // the index of this display (0 is always the primary one) size_t m_index; - DECLARE_NO_COPY_CLASS(wxDisplayBase); + DECLARE_NO_COPY_CLASS(wxDisplayBase) }; #if defined(__WXMSW__) #include "wx/msw/display.h" #elif defined(__WXMOTIF__) - #include "wx/motif/display.h" + #include "wx/unix/displayx11.h" #elif defined(__WXGTK__) - #include "wx/gtk/display.h" + #include "wx/unix/displayx11.h" #elif defined(__WXMAC__) #include "wx/mac/display.h" #elif defined(__WXPM__)