Patch for MacOS (from SALOME forum)

[modules/gui.git] / src / Qtx / Qtx.cxx

diff --git a/src/Qtx/Qtx.cxx b/src/Qtx/Qtx.cxx
index fd7622eec4b862de7a72e5fbb2d50d523deaeaab..d596874ce2988a8647757aed20e31913fb0f7b8e 100755 (executable)
--- a/src/Qtx/Qtx.cxx
+++ b/src/Qtx/Qtx.cxx
@@ -429,13 +429,15 @@ QString Qtx::library( const QString& str )
     name = QString( "lib" ) + name;
 #endif
 
-#ifdef WIN32
+#if defined(WIN32)
   QString libExt( "dll" );
+#elif defined(__APPLE__)
+  QString libExt( "dylib" );
 #else
   QString libExt( "so" );
 #endif
 
-  if ( ext.toLower() != QString( "so" ) && ext.toLower() != QString( "dll" ) )
+  if ( ext.toLower() != QString( "so" ) && ext.toLower() != QString( "dll" ) && ext.toLower() != QString( "dylib" ) )
   {
     if ( !name.isEmpty() && !ext.isEmpty() )
       name += QString( "." );
@@ -2104,7 +2106,7 @@ QFont Qtx::stringToFont( const QString& fontDescription )
   return font;
 }
 
-#ifndef WIN32
+#if !defined WIN32 && !defined __APPLE__ 
 
 #include <X11/Xlib.h>
 #include <GL/glx.h>
@@ -2210,7 +2212,7 @@ Qtx::CmdLineArgs::CmdLineArgs()
 Qtx::CmdLineArgs::~CmdLineArgs()
 {
   for ( int i = 0; i < myArgc; i++ )
-    delete myArgv[i];
+    delete[] myArgv[i];
   delete[] myArgv;
 }