diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-10-30 16:45:02 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-10-30 16:45:02 -0500 |
| commit | f181fbbb337a75257089e64afabd04dac2e1d466 (patch) | |
| tree | 07bf101eeaeae711ed755fc56e9d37de0c50c432 /src | |
| parent | 082a0c06c2d33bd9056f93ff0fa22ab2b0062928 (diff) | |
| download | gtk-qt-engine-f181fbbb337a75257089e64afabd04dac2e1d466.tar.gz gtk-qt-engine-f181fbbb337a75257089e64afabd04dac2e1d466.zip | |
Fix severe iceweasel/icedove tab bar corruption
Clean up minor build warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt_qt_wrapper.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp index 067cf24..d3e13bb 100644 --- a/src/qt_qt_wrapper.cpp +++ b/src/qt_qt_wrapper.cpp @@ -340,7 +340,7 @@ void createTQApp() #endif // USE_FREEBSD #endif // USE_SOLARIS - mozillaFix = (cmdLine.contains("mozilla") || cmdLine.contains("firefox") || cmdLine.contains("thunderbird")); + mozillaFix = (cmdLine.contains("mozilla") || cmdLine.contains("firefox") || cmdLine.contains("iceweasel") || cmdLine.contains("thunderbird") || cmdLine.contains("icedove")); openOfficeFix = (cmdLine.endsWith("soffice.bin")) | (cmdLine.endsWith("swriter.bin")) @@ -703,10 +703,9 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa TQPushButton button(meepWidget); button.setBackgroundOrigin(TQWidget::ParentOrigin); button.setGeometry(x, y, w, h); - if (style->rc_style->bg[GTK_STATE_NORMAL].pixel != 0) + if (style->rc_style->bg[GTK_STATE_NORMAL].pixel != 0) { button.setPaletteBackgroundColor(gdkColorToTQColor(&style->rc_style->bg[GTK_STATE_NORMAL])); - TQPoint p = button.backgroundOffset(); - TQPoint pos = button.pos(); + } TQStyle::SFlags sflags = stateToSFlags(state); @@ -741,8 +740,6 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa button.setGeometry(x, y, w, h); if (style->rc_style->bg[GTK_STATE_NORMAL].pixel != 0) button.setPaletteBackgroundColor(gdkColorToTQColor(&style->rc_style->bg[GTK_STATE_NORMAL])); - TQPoint p = button.backgroundOffset(); - TQPoint pos = button.pos(); TQStyle::SFlags sflags = stateToSFlags(state); @@ -1813,6 +1810,7 @@ void drawArrow(GdkWindow* window, GtkStyle* style, GtkStateType state, GtkArrowT case GTK_ARROW_LEFT: element = TQStyle::PE_ArrowLeft; break; case GTK_ARROW_RIGHT: element = TQStyle::PE_ArrowRight; break; case GTK_ARROW_NONE: return; + default: return; } |