r16270 by craig - Re-enable r16194 by adding OSX/CARBON checks

[scribus-commit]

Author: craig
Date: Mon Jan 17 23:18:07 2011
New Revision: 16270

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16270
Log:
Re-enable r16194 by adding OSX/CARBON checks

Modified:
    branches/Version135/Scribus/scribus/propertiespalette.cpp

Modified: branches/Version135/Scribus/scribus/propertiespalette.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16270&path=/branches/Version135/Scribus/scribus/propertiespalette.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/propertiespalette.cpp (original)
+++ branches/Version135/Scribus/scribus/propertiespalette.cpp Mon Jan 17 23:18:07 2011
@@ -1680,7 +1680,8 @@
 		return;
 	// fix for #5991: Property Palette text input box focus stays even when on another tab
 	// Disable widgets in all pages except current one - PV
-/*	foreach (QObject *o, TabStack->widget(t)->children())
+#if !defined Q_OS_OSX and !defined HAVE_CARBON
+	foreach (QObject *o, TabStack->widget(t)->children())
 	{
 		// Layouts, boxes etc aren't widgets at all
 		// so let's skip them silently...
@@ -1698,7 +1699,7 @@
 			}
 		}
 	}
-*/
+#else
 	bool enable;
 	for (int i = 0; i < TabStack->count(); ++i)
 	{
@@ -1837,6 +1838,7 @@
 			Overprint->setChecked(CurItem->doOverprint);
 		}
 	}
+#endif
 }
 
 void PropertiesPalette::setDoc(ScribusDoc *d)