class QWizardAntiFlickerWidget : public QWidget
{
- QWizard *wizard;
QWizardPrivate *wizardPrivate;
public:
QWizardAntiFlickerWidget(QWizard *wizard, QWizardPrivate *wizardPrivate)
: QWidget(wizard)
- , wizard(wizard)
- , wizardPrivate(wizardPrivate) {}
+#if !defined(QT_NO_STYLE_WINDOWSVISTA)
+ , wizardPrivate(wizardPrivate)
+#endif
+ {}
+
#if !defined(QT_NO_STYLE_WINDOWSVISTA)
protected:
void paintEvent(QPaintEvent *);
int maximumHeight;
};
-static QString buttonDefaultText(int wstyle, int which, const QWizardPrivate *wizardPrivate)
+static QString buttonDefaultText(int wstyle, int which, const QWizardPrivate *wizard)
{
-#if defined(QT_NO_STYLE_WINDOWSVISTA)
- Q_UNUSED(wizardPrivate);
-#endif
const bool macStyle = (wstyle == QWizard::MacStyle);
switch (which) {
case QWizard::BackButton:
if (macStyle)
return QWizard::tr("Continue");
else
+#if defined(QT_NO_STYLE_WINDOWSVISTA)
+ return wizard->isVistaThemeEnabled()
+#else
return wizardPrivate->isVistaThemeEnabled()
+#endif
? QWizard::tr("&Next") : QWizard::tr("&Next >");
case QWizard::CommitButton:
return QWizard::tr("Commit");
int dd = info.depth();
Visual *vis = (Visual*) info.visual();
- if (!X11->use_mitshm || format != QImage::Format_RGB16 && X11->bppForDepth.value(dd) != 32) {
+ if (!X11->use_mitshm || (format != QImage::Format_RGB16 && X11->bppForDepth.value(dd) != 32)) {
image = QImage(width, height, format);
// follow good coding practice and set xshminfo attributes, though values not used in this case
xshminfo.readOnly = true;