diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-12 21:06:45 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-12 21:06:45 +0000 |
| commit | 82d33e27245a5951dc08db23d412a7b97d981d06 (patch) | |
| tree | 7fec5fcdb8c9402791ec701e1a951f0d9eccf196 | |
| parent | 4e7d7fc5e8a1a64520d965463ddfbb59cde2cfcf (diff) | |
| download | tqtinterface-82d33e27.tar.gz tqtinterface-82d33e27.zip | |
Qt3 compilation fix
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1162848 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | qtinterface/tqpaintdevice.cpp | 9 | ||||
| -rw-r--r-- | qtinterface/tqt.h | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/qtinterface/tqpaintdevice.cpp b/qtinterface/tqpaintdevice.cpp index d97a3d4..846342a 100644 --- a/qtinterface/tqpaintdevice.cpp +++ b/qtinterface/tqpaintdevice.cpp @@ -42,6 +42,8 @@ Boston, MA 02110-1301, USA. #include <X11/Xos.h> #include <X11/Xatom.h> +#include <Qt/qcolormap.h> + /*! Returns the window system handle of the paint device for XRender support. Use of this function is not portable. This function will @@ -75,8 +77,11 @@ static GC create_gc( int scrn, bool monochrome ) } else { Window w; XSetWindowAttributes a; - a.background_pixel = Qt::black.pixel( scrn ); - a.border_pixel = Qt::black.pixel( scrn ); + QColormap cmap_background = QColormap::instance( scrn ); + QColormap cmap_border = QColormap::instance( scrn ); + a.background_pixel = cmap_background.pixel( Qt::black ); + a.border_pixel = cmap_border.pixel( Qt::black ); + a.colormap = QPaintDevice::x11AppColormap( scrn ); w = XCreateWindow( appDpy, RootWindow( appDpy, scrn ), 0, 0, 100, 100, 0, QPaintDevice::x11AppDepth( scrn ), InputOutput, diff --git a/qtinterface/tqt.h b/qtinterface/tqt.h index 207d04f..e812b9b 100644 --- a/qtinterface/tqt.h +++ b/qtinterface/tqt.h @@ -65,7 +65,7 @@ Boston, MA 02110-1301, USA. #define TQ_Key_Super_R Key_Super_R #define TQ_Key_Hyper_L Key_Hyper_L #define TQ_Key_Hyper_R Key_Hyper_R -#define TQ_ButtonState ButtonState +#define TQ_ButtonState Qt::ButtonState #define TQ_LeftButton LeftButton #define TQ_MidButton MidButton #define TQ_RightButton RightButton |