diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-12 20:39:47 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-12 20:39:47 +0000 |
| commit | 4e7d7fc5e8a1a64520d965463ddfbb59cde2cfcf (patch) | |
| tree | a05d6051a589e61b46cc0c3d2b2c5802c8e6b755 | |
| parent | 08af9dd21911161841d86bea0f862cd8dc4263bf (diff) | |
| download | tqtinterface-4e7d7fc5e8a1a64520d965463ddfbb59cde2cfcf.tar.gz tqtinterface-4e7d7fc5e8a1a64520d965463ddfbb59cde2cfcf.zip | |
Qt3 still isn't 100% fixed...
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1162841 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | qtinterface/tqpaintdevice.cpp | 19 | ||||
| -rw-r--r-- | qtinterface/tqslider.h | 6 | ||||
| -rw-r--r-- | qtinterface/tqt.h | 3 |
3 files changed, 24 insertions, 4 deletions
diff --git a/qtinterface/tqpaintdevice.cpp b/qtinterface/tqpaintdevice.cpp index 20f41cc..d97a3d4 100644 --- a/qtinterface/tqpaintdevice.cpp +++ b/qtinterface/tqpaintdevice.cpp @@ -24,6 +24,24 @@ Boston, MA 02110-1301, USA. #ifdef USE_QT4 +// the following is necessary to work around breakage in many versions +// of XFree86's Xlib.h still in use +// ### which versions? +#if defined(_XLIB_H_) // crude hack, but... +#error "cannot include <X11/Xlib.h> before this file" +#endif +#define XRegisterIMInstantiateCallback qt_XRegisterIMInstantiateCallback +#define XUnregisterIMInstantiateCallback qt_XUnregisterIMInstantiateCallback +#define XSetIMValues qt_XSetIMValues +#include <X11/Xlib.h> +#undef XRegisterIMInstantiateCallback +#undef XUnregisterIMInstantiateCallback +#undef XSetIMValues + +#include <X11/Xutil.h> +#include <X11/Xos.h> +#include <X11/Xatom.h> + /*! Returns the window system handle of the paint device for XRender support. Use of this function is not portable. This function will @@ -46,6 +64,7 @@ static GC* app_gc_tmp_m = 0; // temporary GC (monochrome) static GC create_gc( int scrn, bool monochrome ) { GC gc; + Display *appDpy = QX11Info::display(); if ( monochrome ) { Pixmap pm = XCreatePixmap( appDpy, RootWindow( appDpy, scrn ), 8, 8, 1 ); gc = XCreateGC( appDpy, pm, 0, 0 ); diff --git a/qtinterface/tqslider.h b/qtinterface/tqslider.h index 2ddfafc..463f414 100644 --- a/qtinterface/tqslider.h +++ b/qtinterface/tqslider.h @@ -29,7 +29,7 @@ Boston, MA 02110-1301, USA. // Reimplement the QSlider class // For Qt3, no changes are needed -#include <tqt4/Qt/qslider.h> +#include <qslider.h> #endif // USE_QT3 @@ -38,8 +38,8 @@ Boston, MA 02110-1301, USA. // Reimplement the QSlider class // For Qt4, some changes are needed -#include <Qt/qslider.h> +#include <tqt4/Qt/qslider.h> #endif // USE_QT4 -#endif /* TQSLIDER_H */
\ No newline at end of file +#endif /* TQSLIDER_H */ diff --git a/qtinterface/tqt.h b/qtinterface/tqt.h index 03c8a7c..207d04f 100644 --- a/qtinterface/tqt.h +++ b/qtinterface/tqt.h @@ -673,7 +673,8 @@ class QUObject; #define TQNoBrush Qt::NoBrush #define QMetaData QMetaMethod -#define qt_xdisplay QPaintDevice::x11Display +//#define qt_xdisplay QPaintDevice::x11Display +#define qt_xdisplay QX11Info::display #define qt_xrootwin QPaintDevice::x11AppRootWindow #define qt_xscreen QPaintDevice::x11Screen #define qt_xget_temp_gc QPaintDevice::qt_xget_temp_gc |