X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGLViewer%2FGLViewer_Viewer2d.cxx;h=b1667f4c4655129058f5d379e99f583c5537b49a;hb=b6e35aa42d3c67a529d7f9339718dfaed6891323;hp=b91b6248a06ee626798685744e943e25b998d576;hpb=91cc8846bfa36302f7ade6cb8aa380f03e90423e;p=modules%2Fgui.git

diff --git a/src/GLViewer/GLViewer_Viewer2d.cxx b/src/GLViewer/GLViewer_Viewer2d.cxx
index b91b6248a..b1667f4c4 100644
--- a/src/GLViewer/GLViewer_Viewer2d.cxx
+++ b/src/GLViewer/GLViewer_Viewer2d.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2024  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
@@ -113,30 +113,8 @@ void GLViewer_Viewer2d::onChangeBgColor()
 /*!
   Updates colors for all drawers (does not work)
 */
-void GLViewer_Viewer2d::updateColors( QColor colorH, QColor colorS )
+void GLViewer_Viewer2d::updateColors( QColor /*colorH*/, QColor /*colorS*/ )
 {
-//  cout << "GLViewer_Viewer2d::updateColors" << endl;
-
-/*
-    for ( DrawerMap::Iterator it = myDrawers.begin(); it != myDrawers.end(); ++it )
-    {
-        it.key()->setHColor( colorH );
-        it.key()->setSColor( colorS );
-    }
-*/
-    /*
-    ObjList anObjects = myGLContext->getObjects();
-    ObjList::Iterator beginIt = anObjects.begin();
-    ObjList::Iterator endIt = anObjects.end();
-    for ( ObjList::Iterator it = beginIt; it != endIt; ++it )
-    {
-        //GLViewer_Drawer* aDrawer = (*it)->getDrawer();
-        //aDrawer->setHColor( colorH );
-        //aDrawer->setSColor( colorS );
-    }
-    */
-
-
   activateAllDrawers( true );
 }
 
@@ -215,12 +193,8 @@ void GLViewer_Viewer2d::updateAll()
 /*!
    \param onlyUpdate is passed to method activateAllDrawers drawers
 */
-void GLViewer_Viewer2d::updateDrawers( GLboolean update, GLfloat scX, GLfloat scY )
+void GLViewer_Viewer2d::updateDrawers( GLboolean update, GLfloat /*scX*/, GLfloat /*scY*/ )
 {
-//  cout << "GLViewer_Viewer2d::updateDrawers" << endl;
-
-    //myGLContext->updateScales( scX, scY );
-    //myGLSketcher->drawContour();
     activateAllDrawers( update );
 }
 
@@ -639,7 +613,7 @@ void GLViewer_Viewer2d::onMouseEvent( SUIT_ViewWindow*, QMouseEvent* e )
 */
 bool GLViewer_Viewer2d::testRotation( QMouseEvent* e )
 {
-    if ( ( e->button() == GLViewer_View2dTransformer::rotateButton() ) &&
+  if ( ( (int)e->button() == GLViewer_View2dTransformer::rotateButton() ) && // todo Qt::MouseButton is unsigned int: comparison of int with uint
          ( e->type() == QEvent::MouseButtonPress ) &&
          ( e->modifiers() & GLViewer_ViewTransformer::accelKey() ) )
     {
@@ -731,7 +705,7 @@ bool GLViewer_Viewer2d::translateTo( VectorFileType aType, QString FileName, Pap
     if ( !getActiveView() )
       return false;
 
-        QFile hFile( FileName.toLatin1() );
+        QFile hFile( FileName.toUtf8() );
 
 #ifdef WIN32
     HDC hMetaFileDC;
@@ -793,7 +767,20 @@ bool GLViewer_Viewer2d::translateTo( VectorFileType aType, QString FileName, Pap
         HDC screen_dc = GetDC( 0 ); //The screen device context
         HDC bitDC = CreateCompatibleDC ( screen_dc ); //The context compatible with screen
 
-        hMetaFileDC = CreateEnhMetaFile( bitDC, FileName.toLatin1().data(), &r, "" );
+#ifdef UNICODE
+	LPTSTR str = new TCHAR[FileName.length() + 1];
+	str[FileName.toWCharArray(str)] = '\0';
+	LPTSTR empty = L"";
+#else  
+	QByteArray arr = FileName.toLatin1();
+	LPTSTR str = arr.constData();
+	LPTSTR empty = "";
+#endif
+
+        hMetaFileDC = CreateEnhMetaFile( bitDC, str, &r, empty );
+#ifdef UNICODE
+	delete str;
+#endif 
         SetMapMode( hMetaFileDC, MM_HIMETRIC );
         SetWindowOrgEx( hMetaFileDC, 0, r.bottom, NULL );
         HRGN ClipRgn = CreateRectRgn( 0, 0, AW, AH );
@@ -808,7 +795,7 @@ bool GLViewer_Viewer2d::translateTo( VectorFileType aType, QString FileName, Pap
         ReleaseDC( 0, screen_dc );
         DeleteDC( bitDC );
 
-        aCurVP->getGLWidget()->translateBackgroundToEMF( hMetaFileDC, &aViewerCS, &aPaperCS );
+        aCurVP->getGLWidget()->translateBackgroundToEMF( hMetaFileDC, &aViewerCS, &aPaperCS );	
     }
 #endif