diff options
Diffstat (limited to 'src/opengl/ntqgl.h')
| -rw-r--r-- | src/opengl/ntqgl.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/opengl/ntqgl.h b/src/opengl/ntqgl.h index 4b0657161..858a96494 100644 --- a/src/opengl/ntqgl.h +++ b/src/opengl/ntqgl.h @@ -61,11 +61,11 @@ TQM_EXPORT_OPENGL inline const char *qGLVersion() { } #endif -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) # include "qt_windows.h" #endif -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) #if !defined( TQMAC_OPENGL_DOUBLEBUFFER ) /* This macro is different now. If the macro is not defined TQGLWidget will * try to determine when you need double buffering. If set to 0 it will @@ -83,12 +83,12 @@ TQM_EXPORT_OPENGL inline const char *qGLVersion() { # include <GL/glu.h> #endif -#if defined(Q_WS_WIN) || defined(Q_WS_MAC) +#if defined(TQ_WS_WIN) || defined(TQ_WS_MAC) class TQGLCmap; #endif class TQPixmap; -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) class TQGLOverlayWidget; #endif @@ -202,14 +202,14 @@ protected: virtual bool chooseContext( const TQGLContext* shareContext = 0 ); virtual void doneCurrent(); // ### 4.0: make this public - needed for multithreading stuff -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) virtual int choosePixelFormat( void* pfd, HDC pdc ); #endif -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) virtual void* tryVisual( const TQGLFormat& f, int bufDepth = 1 ); virtual void* chooseVisual(); #endif -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) virtual void* chooseMacVisual(GDHandle); #endif @@ -225,16 +225,16 @@ protected: void setDevice( TQPaintDevice *pDev ); protected: -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) HGLRC rc; HDC dc; WId win; int pixelFormatId; TQGLCmap* cmap; -#elif defined(Q_WS_X11) || defined(Q_WS_MAC) +#elif defined(TQ_WS_X11) || defined(TQ_WS_MAC) void* vi; void* cx; -#if defined(Q_WS_X11) +#if defined(TQ_WS_X11) TQ_UINT32 gpm; #endif #endif @@ -252,14 +252,14 @@ private: bool crWin; TQPaintDevice* paintDevice; TQColor transpColor; -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC TQRect oldR; #endif }; Private* d; friend class TQGLWidget; -#ifdef Q_WS_MAC +#ifdef TQ_WS_MAC void fixBufferRect(); #endif @@ -359,9 +359,9 @@ private: TQGLColormap cmap; -#if defined(Q_WS_WIN) || defined(Q_WS_MAC) +#if defined(TQ_WS_WIN) || defined(TQ_WS_MAC) TQGLContext* olcx; -#elif defined(Q_WS_X11) +#elif defined(TQ_WS_X11) TQGLOverlayWidget* olw; friend class TQGLOverlayWidget; #endif @@ -372,7 +372,7 @@ private: // Disabled copy constructor and operator= TQGLWidget& operator=( const TQGLWidget& ); #endif -#if defined(Q_WS_MAC) +#if defined(TQ_WS_MAC) private: const TQGLContext *slcx; uint pending_fix : 1, |