]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
Appends definition of QT_NO_CUPS. Improvement for Suse-32 platform, which hasn't...
authornds <nds@opencascade.com>
Tue, 22 Apr 2008 14:29:20 +0000 (14:29 +0000)
committernds <nds@opencascade.com>
Tue, 22 Apr 2008 14:29:20 +0000 (14:29 +0000)
src/Plot2d/Plot2d_ViewWindow.cxx
src/Qtx/Qtx.cxx
src/SUIT/SUIT_ViewWindow.cxx

index 2d8f3d9dfac115101cb1efd8780b308f0dd29303..0cde75a624a7817e610e7b4bdddf3c73d9317220 100755 (executable)
@@ -637,7 +637,7 @@ void Plot2d_ViewWindow::onPrintView()
   if ( !myViewFrame )
     return;
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(QT_NO_CUPS)
 #if QT_VERSION < 0x040303
   if ( !Qtx::hasAnyPrinters() ) {
     SUIT_MessageBox::warning( this, tr( "WRN_WARNING" ),
index a5d77d03430c74d31be556f6a4e29cc8c3414b78..11b6166a42eda7e2c6094050457545e10fa162b9 100755 (executable)
@@ -1263,7 +1263,7 @@ bool Qtx::stringToConicalGradient( const QString& str, QConicalGradient& gradien
  * Cheque for existing any system printers
  */
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(QT_NO_CUPS)
 #if QT_VERSION < 0x040303
 #include <QLibrary>
 #include <cups/cups.h>
@@ -1275,7 +1275,7 @@ static CupsGetDests _cupsGetDests = 0;
 bool Qtx::hasAnyPrinters()
 {
   bool aRes = true;
-#ifndef WIN32
+#if !defined(WIN32) && !defined(QT_NO_CUPS)
 #if QT_VERSION < 0x040303
   QLibrary aCupsLib( QString( "cups" ) );
   if ( !aCupsLib.load() )
index 9cde13e929393773ff29747b8debb965c678bc5e..ca584e2a815394b062d78f828a1fc50e74753b78 100755 (executable)
@@ -229,7 +229,7 @@ void SUIT_ViewWindow::printImage( const QImage& theImage, QWidget* theWidget )
   if ( theImage.isNull() )
     return;
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(QT_NO_CUPS)
 #if QT_VERSION < 0x040303
   if ( !Qtx::hasAnyPrinters() ) {
     SUIT_MessageBox::warning( this, tr( "WRN_WARNING" ),