Use new C++ sockets for everything except OS/2

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

diff --git a/include/wx/display.h b/include/wx/display.h
index 0714805e5c4af9491cf90eb5ce7158292c861cc7..e46e596b70677fc5e6f02b45e8ecf71312ca8465 100644 (file)
--- a/include/wx/display.h
+++ b/include/wx/display.h
@@ -5,14 +5,14 @@
 // Modified by: Vadim Zeitlin (resolution changes, display modes, ...)
 // Created:     06/21/02
 // RCS-ID:      $Id$
 // Modified by: Vadim Zeitlin (resolution changes, display modes, ...)
 // Created:     06/21/02
 // RCS-ID:      $Id$

-// Copyright:   (c) 2002-2003 wxWindows team
+// Copyright:   (c) 2002-2003 wxWidgets team

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DISPLAY_H_BASE_
 #define _WX_DISPLAY_H_BASE_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DISPLAY_H_BASE_
 #define _WX_DISPLAY_H_BASE_
 

-#ifdef wxUSE_DISPLAY
+#if wxUSE_DISPLAY

 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "displaybase.h"
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "displaybase.h"


@@ -109,6 +109,8 @@ protected:
     #include "wx/unix/displayx11.h"
 #elif defined(__WXGTK__)
     #include "wx/unix/displayx11.h"
     #include "wx/unix/displayx11.h"
 #elif defined(__WXGTK__)
     #include "wx/unix/displayx11.h"

+#elif defined(__WXX11__)
+    #include "wx/unix/displayx11.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/display.h"
 #elif defined(__WXPM__)
 #elif defined(__WXMAC__)
     #include "wx/mac/display.h"
 #elif defined(__WXPM__)