non-osx methods bracketed

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

diff --git a/include/wx/display.h b/include/wx/display.h
index 0714805e5c4af9491cf90eb5ce7158292c861cc7..083ae2b9548e0827df20a168b6d732ec8db4b4fd 100644 (file)
--- a/include/wx/display.h
+++ b/include/wx/display.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DISPLAY_H_BASE_
 #define _WX_DISPLAY_H_BASE_
 
 #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__)