r18247 by craig - #11472: Comment out QMacStyle related code

[scribus-commit]

Author: craig
Date: Sun Apr 14 13:32:34 2013
New Revision: 18247

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18247
Log:
#11472: Comment out QMacStyle related code

Modified:
    trunk/Scribus/scribus/ui/colorcombo.h
    trunk/Scribus/scribus/ui/sccombobox.cpp

Modified: trunk/Scribus/scribus/ui/colorcombo.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18247&path=/trunk/Scribus/scribus/ui/colorcombo.h
==============================================================================
--- trunk/Scribus/scribus/ui/colorcombo.h (original)
+++ trunk/Scribus/scribus/ui/colorcombo.h Sun Apr 14 13:32:34 2013
@@ -18,10 +18,11 @@
 
 #include <QComboBox>
 
-#ifdef Q_OS_MAC
+/*
+ *#ifdef Q_OS_MAC
 #include <QMacStyle>
 #endif
-
+*/
 #include "scribusapi.h"
 #include "colorlistbox.h"
 
@@ -35,6 +36,7 @@
 
 private:
 
+		/*
 #ifdef Q_OS_MAC
 	/// use listbox instead of popupmenu for combo boxes
 	class ScMacStyle : public QMacStyle 
@@ -48,6 +50,7 @@
 		}
 	};
 #endif
+*/
 
 public:
 

Modified: trunk/Scribus/scribus/ui/sccombobox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18247&path=/trunk/Scribus/scribus/ui/sccombobox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/sccombobox.cpp (original)
+++ trunk/Scribus/scribus/ui/sccombobox.cpp Sun Apr 14 13:32:34 2013
@@ -14,7 +14,7 @@
  */
 
 #include "sccombobox.h"
-
+/*
 #ifdef Q_OS_MAC
 
 #include <QMacStyle>
@@ -30,12 +30,15 @@
 	}
 };
 #endif
+*/
 
 ScComboBox::ScComboBox( QWidget* parent ) : QComboBox(parent)
 {
+	/*
 #ifdef Q_OS_MAC
 	setStyle( new ScMacStyle );
 #endif
-//Qt4	setListBox( new Q3ListBox( this, "in-combo", Qt::WType_Popup ) );
+*/
+	//Qt4	setListBox( new Q3ListBox( this, "in-combo", Qt::WType_Popup ) );
 }