added conversion to and from std::string and std::wstring (if wxUSE_STD_STRING)

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

diff --git a/include/wx/utils.h b/include/wx/utils.h
index d0eb5286dd8111856cc7abd2ed0b12eba45df271..40e742482ccc38dd64e5ac913b82ecbdd22ea9f2 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -656,9 +656,11 @@ void WXDLLEXPORT wxGetMousePosition( int* x, int* y );
 #endif // MSW
 
 // ----------------------------------------------------------------------------
-// Display and colorss (X only)
+// X11 Display access
 // ----------------------------------------------------------------------------
 
+#if defined(__X__) || defined(__WXGTK__)
+
 #ifdef __WXGTK__
     void *wxGetDisplay();
 #endif
@@ -675,6 +677,8 @@ inline struct _XDisplay *wxGetX11Display()
     return (_XDisplay *)wxGetDisplay();
 }
 
+#endif // X11 || wxGTK
+
 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------