X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGLViewer%2FGLViewer_Drawer.cxx;h=bbe2b533bac34e3f10167f78b90a4ba8d02234fb;hb=refs%2Ftags%2FV9_11_0;hp=13d5e8acbef14f0b6bbaffb3abc2e4e93ceba5ec;hpb=c9eb32123d4286f92442b06f6ecdf27468b5dec5;p=modules%2Fgui.git

diff --git a/src/GLViewer/GLViewer_Drawer.cxx b/src/GLViewer/GLViewer_Drawer.cxx
index 13d5e8acb..bbe2b533b 100644
--- a/src/GLViewer/GLViewer_Drawer.cxx
+++ b/src/GLViewer/GLViewer_Drawer.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -77,7 +77,7 @@ void GLViewer_TexFont::clearTextBases()
   Default constructor
 */
 GLViewer_TexFont::GLViewer_TexFont()
-: myMaxRowWidth( 0 ), myFontHeight( 0 )
+: myFontHeight( 0 ), myMaxRowWidth( 0 )
 {
     myQFont = QApplication::font();//QFont::defaultFont();
     mySeparator = 2;
@@ -95,7 +95,7 @@ GLViewer_TexFont::GLViewer_TexFont()
   \param theMinMagFilter - min/mag filter, affects text sharpness
 */
 GLViewer_TexFont::GLViewer_TexFont( QFont* theFont, int theSeparator, bool theIsResizeable, GLuint theMinMagFilter )
-: myMaxRowWidth( 0 ), myFontHeight( 0 )
+: myFontHeight( 0 ), myMaxRowWidth( 0 )
 {
     myQFont = *theFont;
     mySeparator = theSeparator;
@@ -161,7 +161,7 @@ bool GLViewer_TexFont::generateTexture()
     aFindFont.myIsItal = myQFont.italic();
     aFindFont.myIsUndl = myQFont.underline();
     aFindFont.myPointSize = myQFont.pointSize();
-    aFindFont.myViewPortId = size_t(QGLContext::currentContext());
+    aFindFont.myViewPortId = (long)QGLContext::currentContext(); //!<TODO: conversion from "size_t" to "long"
         
     if( TexFontBase.contains( aFindFont ) )
     {
@@ -384,7 +384,7 @@ static GLuint displayListBase( QFont* theFont )
   if ( !ctx )
     return aList;  
   
-  aFindFont.myViewPortId = (int)ctx;
+  aFindFont.myViewPortId = (LONG_PTR)ctx;
 
   if ( GLViewer_TexFont::BitmapFontCache.contains( aFindFont ) )
     aList = GLViewer_TexFont::BitmapFontCache[aFindFont];
@@ -394,15 +394,12 @@ static GLuint displayListBase( QFont* theFont )
     QMap<GLViewer_TexFindId, GLuint>::iterator it = GLViewer_TexFont::BitmapFontCache.begin();
     for ( ; it != GLViewer_TexFont::BitmapFontCache.end(); ++it )
     {
-      if ( it.key().myViewPortId == (int)ctx && it.value() > listBase )
+      if ( it.key().myViewPortId == (LONG_PTR)ctx && it.value() > listBase )
         listBase = it.value();
     }
     listBase += 256;
 
     HDC glHdc = ::wglGetCurrentDC();
- #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    ::SelectObject( glHdc, theFont->handle() );
- #endif
     if ( !::wglUseFontBitmaps( glHdc, 0, 256, listBase ) )
       listBase = 0;
     aList = listBase;
@@ -454,7 +451,7 @@ static GLuint displayListBase( QFont* theFont )
     return aList;
   }
 
-  aFindFont.myViewPortId = size_t(aCont);
+  aFindFont.myViewPortId = (long)aCont;
 
   if ( GLViewer_TexFont::BitmapFontCache.contains( aFindFont ) )
     aList = GLViewer_TexFont::BitmapFontCache[aFindFont];
@@ -464,7 +461,7 @@ static GLuint displayListBase( QFont* theFont )
     QMap<GLViewer_TexFindId, GLuint>::iterator it = GLViewer_TexFont::BitmapFontCache.begin();
     for ( ; it != GLViewer_TexFont::BitmapFontCache.end(); ++it )
     {
-      if ( it.key().myViewPortId == size_t(aCont) && it.value() > listBase )
+      if ( it.key().myViewPortId == (long)aCont && it.value() > listBase )
         listBase = it.value();
     }
     listBase += 256;
@@ -474,33 +471,24 @@ static GLuint displayListBase( QFont* theFont )
     QString aFontDef = theFont->toString();
     char** xFontList = XListFonts( aDisp, aFontDef.toLatin1()/*aFindFont.myFontString.data()*/, 1, &aFontCont  );
 // TODO (QT5 PORTING) Below is a temporary solution, to allow compiling with Qt 5
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    if( !theFont->handle() )
-    {
-#endif
 #ifdef _DEBUG_
-      printf( "Can't load font %s. loading default font....\n", aFontDef.toLatin1().data()/*aFindFont.myFontString.data()*/ );
+    printf( "Can't load font %s. loading default font....\n", aFontDef.toLatin1().data()/*aFindFont.myFontString.data()*/ );
 #endif
-      QString aFontMask ("-*-*-*-r-*-*-");
-      aFontMask += aFontDef/*aFindFont.myFontString*/.section( ',', 1, 1 );
+    QString aFontMask ("-*-*-*-r-*-*-");
+    aFontMask += aFontDef/*aFindFont.myFontString*/.section( ',', 1, 1 );
 #ifdef _DEBUG_
-      printf( "Height of Default font: %s\n", aFontDef/*aFindFont.myFontString*/.section( ',', 1, 1 ).data() );
+    printf( "Height of Default font: %s\n", aFontDef/*aFindFont.myFontString*/.section( ',', 1, 1 ).data() );
 #endif
-      aFontMask += "-*-*-*-m-*-*-*";
-      xFontList = XListFonts( aDisp, aFontMask.toLatin1().constData()/*"-*-*-*-r-*-*-12-*-*-*-m-*-*-*"*/, 1, &aFontCont  );
-      if( aFontCont == 0 )
-      {
+    aFontMask += "-*-*-*-m-*-*-*";
+    xFontList = XListFonts( aDisp, aFontMask.toLatin1().constData()/*"-*-*-*-r-*-*-12-*-*-*-m-*-*-*"*/, 1, &aFontCont  );
+    if( aFontCont == 0 )
+    {
 #ifdef _DEBUG_
-        printf( "Can't load default font\n" );
+      printf( "Can't load default font\n" );
 #endif
-        return 0;
-      }
-      glXUseXFont( (Font)(XLoadFont( aDisp,xFontList[0] )), 0, 256, listBase );
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+      return 0;
     }
-    else
-      glXUseXFont( (Font)(theFont->handle()), 0, 256, listBase );
-#endif
+    glXUseXFont( (Font)(XLoadFont( aDisp,xFontList[0] )), 0, 256, listBase );
     aList = listBase;
     GLViewer_TexFont::BitmapFontCache[aFindFont] = aList;
   }