diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-24 11:33:14 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-12 01:48:32 +0200 |
| commit | 3cddfb67a2484fa44c7f4134bc3aa3070a05a209 (patch) | |
| tree | 3db88fc1c95a48344f81b3f76c676bc79686c092 | |
| parent | c9aeaa2c7ca1a9a4c3d901b1611e869f1b0d99c8 (diff) | |
| download | gtk-qt-engine-3cddfb67a2484fa44c7f4134bc3aa3070a05a209.tar.gz gtk-qt-engine-3cddfb67a2484fa44c7f4134bc3aa3070a05a209.zip | |
Rename a few stragglers
(cherry picked from commit 90085d290f002c90cec34712eec8c8189b1bf305)
| -rw-r--r-- | src/qt_qt_wrapper.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp index 808d1a8..9ccee0f 100644 --- a/src/qt_qt_wrapper.cpp +++ b/src/qt_qt_wrapper.cpp @@ -1987,15 +1987,15 @@ void setRcProperties(GtkRcStyle* rc_style, int forceRecreate) // Mouseover setColour("fg[PRELIGHT]", tqApp->palette().active().text()); // menu items - change? - setColour("bg[PRELIGHT]", tqApp->tqpalette().active().highlight()); + setColour("bg[PRELIGHT]", tqApp->palette().active().highlight()); setColour("text[PRELIGHT]", tqApp->palette().active().text()); setColour("base[PRELIGHT]", tqApp->palette().active().base()); // Selected - setColour("fg[SELECTED]", tqApp->tqpalette().active().highlightedText()); - setColour("bg[SELECTED]", tqApp->tqpalette().active().highlight()); - setColour("text[SELECTED]", tqApp->tqpalette().active().highlightedText()); - setColour("base[SELECTED]", tqApp->tqpalette().active().highlight()); + setColour("fg[SELECTED]", tqApp->palette().active().highlightedText()); + setColour("bg[SELECTED]", tqApp->palette().active().highlight()); + setColour("text[SELECTED]", tqApp->palette().active().highlightedText()); + setColour("base[SELECTED]", tqApp->palette().active().highlight()); // Disabled setColour("fg[INSENSITIVE]", tqApp->palette().disabled().text()); @@ -2346,7 +2346,7 @@ void getTextColor(GdkColor *color, GtkStateType state_type) return; if ((state_type == GTK_STATE_PRELIGHT) || (state_type == GTK_STATE_ACTIVE) || (state_type == GTK_STATE_SELECTED)) - setColour(color, tqApp->tqpalette().active().highlightedText()); + setColour(color, tqApp->palette().active().highlightedText()); else if (state_type == GTK_STATE_NORMAL) setColour(color, tqApp->palette().active().text()); else if (state_type == GTK_STATE_INSENSITIVE) |