diff options
| author | Fabian Schillinger | 2010-11-01 17:35:27 +0100 |
|---|---|---|
| committer | Fabian Schillinger | 2010-11-01 17:35:27 +0100 |
| commit | ea3fb17345e5f82db9f2e98a8062e95797700ace (patch) | |
| tree | 1da0d1a8ec9455364386af78762d0f6fed187824 /src/util/clientGUIUtils.h | |
| parent | Process start/stop/view functionality (diff) | |
| parent | [PVSGUI] No X required for --help and --version (diff) | |
| download | pvs-ea3fb17345e5f82db9f2e98a8062e95797700ace.tar.gz pvs-ea3fb17345e5f82db9f2e98a8062e95797700ace.tar.xz pvs-ea3fb17345e5f82db9f2e98a8062e95797700ace.zip | |
Merge branch 'master' of openslx.org:pvs
Conflicts:
CMakeLists.txt
src/core/pvsConnectionManager.cpp
src/pvs.cpp
src/pvs.h
Diffstat (limited to 'src/util/clientGUIUtils.h')
| -rwxr-xr-x | src/util/clientGUIUtils.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/util/clientGUIUtils.h b/src/util/clientGUIUtils.h index b04d3fe..7f7ea47 100755 --- a/src/util/clientGUIUtils.h +++ b/src/util/clientGUIUtils.h @@ -25,4 +25,14 @@ private: BlankScreen_Sysdep* _sysdep; }; -#endif
\ No newline at end of file +#ifndef __WIN32__ +# include <X11/Xlib.h> + +class X11Info +{ +public: + static Display* display(); +}; +#endif /* !__WIN32__ */ + +#endif |