collection support for XTI

[wxWidgets.git] / include / wx / display.h

diff --git a/include/wx/display.h b/include/wx/display.h
index a63376b6c7cefedc9d341fdf1026f17a44bb2d38..a9eeb86607e3248085ce49f085578ba720b7b09f 100644 (file)
--- a/include/wx/display.h
+++ b/include/wx/display.h
@@ -14,7 +14,7 @@
 
 #if wxUSE_DISPLAY
 
 
 #if wxUSE_DISPLAY
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "displaybase.h"
 #endif
 
     #pragma interface "displaybase.h"
 #endif
 


@@ -150,7 +150,7 @@ protected:
 #if defined(__WXMSW__)
     #include "wx/msw/display.h"
 #elif defined(__WXMOTIF__)
 #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/unix/displayx11.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXGTK__)
     #include "wx/unix/displayx11.h"
 #elif defined(__WXMAC__)