From 75b38354b997e2a4d64336fbd2e9e0c692fec3fb Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 16 May 2011 15:40:58 +0000 Subject: [PATCH] .CtrlLib: ChGtk issues git-svn-id: svn://ultimatepp.org/upp/trunk@3422 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlLib/ChGtk.cpp | 6 ++++++ uppsrc/CtrlLib/ChGtk.h | 4 ++++ uppsrc/CtrlLib/ChGtk0.cpp | 2 -- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/uppsrc/CtrlLib/ChGtk.cpp b/uppsrc/CtrlLib/ChGtk.cpp index 7b757e715..aba6bde38 100644 --- a/uppsrc/CtrlLib/ChGtk.cpp +++ b/uppsrc/CtrlLib/ChGtk.cpp @@ -1,3 +1,6 @@ +#ifdef PLATFORM_X11 +#ifndef flagNOGTK + #include "CtrlLib.h" #include "ChGtk.h" @@ -719,3 +722,6 @@ void ChHostSkin() } END_UPP_NAMESPACE + +#endif +#endif diff --git a/uppsrc/CtrlLib/ChGtk.h b/uppsrc/CtrlLib/ChGtk.h index e70235d76..bbc62e604 100644 --- a/uppsrc/CtrlLib/ChGtk.h +++ b/uppsrc/CtrlLib/ChGtk.h @@ -1,3 +1,5 @@ +#ifdef PLATFORM_X11 + #define Time XTime #define Font XFont #define Display XDisplay @@ -124,3 +126,5 @@ int GtkStyleInt(const char *name); String GtkStyleString(const char *name); }; + +#endif diff --git a/uppsrc/CtrlLib/ChGtk0.cpp b/uppsrc/CtrlLib/ChGtk0.cpp index 3b91f6f9d..2c873780a 100644 --- a/uppsrc/CtrlLib/ChGtk0.cpp +++ b/uppsrc/CtrlLib/ChGtk0.cpp @@ -528,6 +528,4 @@ String GtkStyleString(const char *name) END_UPP_NAMESPACE #endif - #endif -