Drop gamma ramp code

[irrlicht.git] / source / Irrlicht / CIrrDeviceLinux.h

diff --git a/source/Irrlicht/CIrrDeviceLinux.h b/source/Irrlicht/CIrrDeviceLinux.h
index 066140e896e0376b85bf0956de7947a15207adf6..9e3479f6eb981ced86a1d70631d4667407d88a90 100644 (file)
--- a/source/Irrlicht/CIrrDeviceLinux.h
+++ b/source/Irrlicht/CIrrDeviceLinux.h
@@ -20,12 +20,6 @@
 #include <X11/Xlib.h>\r
 #include <X11/Xutil.h>\r
 #include <X11/cursorfont.h>\r
-#ifdef _IRR_LINUX_X11_VIDMODE_\r
-#include <X11/extensions/xf86vmode.h>\r
-#endif\r
-#ifdef _IRR_LINUX_X11_RANDR_\r
-#include <X11/extensions/Xrandr.h>\r
-#endif\r
 #include <X11/keysym.h>\r
 \r
 #ifdef _IRR_LINUX_X11_XINPUT2_\r
@@ -101,19 +95,14 @@ namespace irr
                //! Activate any joysticks, and generate events for them.\r
                virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo) _IRR_OVERRIDE_;\r
 \r
-               //! Set the current Gamma Value for the Display\r
-               virtual bool setGammaRamp( f32 red, f32 green, f32 blue, f32 brightness, f32 contrast ) _IRR_OVERRIDE_;\r
-\r
-               //! Get the current Gamma Value for the Display\r
-               virtual bool getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &brightness, f32 &contrast ) _IRR_OVERRIDE_;\r
-\r
                //! gets text from the clipboard\r
-               //! \return Returns 0 if no string is in there.\r
-               virtual const c8* getTextFromClipboard() const;\r
+               //! \return Returns 0 if no string is in there, otherwise utf-8 text.\r
+               virtual const c8 *getTextFromClipboard() const;\r
 \r
                //! copies text to the clipboard\r
                //! This sets the clipboard selection and _not_ the primary selection which you have on X on the middle mouse button.\r
-               virtual void copyToClipboard(const c8* text) const;\r
+               //! @param text The text in utf-8\r
+               virtual void copyToClipboard(const c8 *text) const;\r
 \r
                //! Remove all messages pending in the system message loop\r
                virtual void clearSystemMessages() _IRR_OVERRIDE_;\r
@@ -425,6 +414,7 @@ namespace irr
                XIM XInputMethod;\r
                XIC XInputContext;\r
                bool HasNetWM;\r
+               // text is utf-8\r
                mutable core::stringc Clipboard;\r
 #endif\r
                u32 Width, Height;\r