applied patch fixing problems with X server crash when using wxGLCanvas with nVidia...

[wxWidgets.git] / include / wx / unix / utilsx11.h

diff --git a/include/wx/unix/utilsx11.h b/include/wx/unix/utilsx11.h
index 44353ef31fb195def5aec8077dc2368482f9181c..c7dce2a3699593dd6e051d64d9d21076cc9f90a4 100644 (file)
--- a/include/wx/unix/utilsx11.h
+++ b/include/wx/unix/utilsx11.h
@@ -1,18 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/unix/utilsx11.h
 // Purpose:     Miscellaneous X11 functions
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/unix/utilsx11.h
 // Purpose:     Miscellaneous X11 functions

-// Author:      Mattia Barbon
+// Author:      Mattia Barbon, Vaclav Slavik

 // Modified by:
 // Created:     25.03.02
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     25.03.02
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIX_UTILSX11_H_
 #define _WX_UNIX_UTILSX11_H_
 
 #include "wx/defs.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIX_UTILSX11_H_
 #define _WX_UNIX_UTILSX11_H_
 
 #include "wx/defs.h"

+#include "wx/gdicmn.h"
+
+// NB: Content of this header is for wxWidgets' private use! It is not
+//     part of public API and may be modified or even disappear in the future!

 
 #if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXX11__)
 
 
 #if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXX11__)
 


@@ -26,6 +30,22 @@ class wxIconBundle;
 void wxSetIconsX11( WXDisplay* display, WXWindow window,
                     const wxIconBundle& ib );
 
 void wxSetIconsX11( WXDisplay* display, WXWindow window,
                     const wxIconBundle& ib );
 

+
+enum wxX11FullScreenMethod
+{
+    wxX11_FS_AUTODETECT = 0,
+    wxX11_FS_WMSPEC,
+    wxX11_FS_KDE,
+    wxX11_FS_GENERIC
+};
+
+wxX11FullScreenMethod wxGetFullScreenMethodX11(WXDisplay* display,
+                                               WXWindow rootWindow);
+
+void wxSetFullScreenStateX11(WXDisplay* display, WXWindow rootWindow,
+                             WXWindow window, bool show, wxRect *origSize,
+                             wxX11FullScreenMethod method);
+

 #endif
     // __WXMOTIF__, __WXGTK__, __WXX11__
 
 #endif
     // __WXMOTIF__, __WXGTK__, __WXX11__