From 6713ac1b169287c7c6c0572ef9951a66b796b9cf Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 12 Jul 2023 09:38:13 +0900 Subject: Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3. Signed-off-by: Michele Calgaro (cherry picked from commit 6a57fe022a5669d12195eda34c08d7b8870ca0c1) --- tdegtk/tdegtk-theme.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tdegtk/tdegtk-theme.cpp') diff --git a/tdegtk/tdegtk-theme.cpp b/tdegtk/tdegtk-theme.cpp index aa7751e..1ff5d98 100644 --- a/tdegtk/tdegtk-theme.cpp +++ b/tdegtk/tdegtk-theme.cpp @@ -496,7 +496,7 @@ void writeGtkThemeControlFile(int forceRecreate) { // Menu items { TQStringList objectTypes; - objectTypes.append(TQPOPUPMENU_OBJECT_NAME_STRING); + objectTypes.append("TQPopupMenu"); TQPalette objectPalette = tqApp->palette(objectTypes); setColour("color", "hover:insensitive", objectPalette.color(TQPalette::Disabled, TQColorGroup::Text), "GtkMenu>GtkMenuItem"); // setColour("color", "hover:normal", objectPalette.color(TQPalette::Active, TQColorGroup::HighlightedText), "GtkMenu>GtkMenuItem"); @@ -909,7 +909,7 @@ void writeGtkThemeControlFile(int forceRecreate) { probeRect = TQRect(0, 0, 100, 100); TQStringList objectTypes; - objectTypes.append(TQCOMBOBOX_OBJECT_NAME_STRING); + objectTypes.append("TQComboBox"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -956,7 +956,7 @@ void writeGtkThemeControlFile(int forceRecreate) { // See upstream GTK bug #687363 { TQStringList objectTypes; - objectTypes.append(TQTEXTEDIT_OBJECT_NAME_STRING); + objectTypes.append("TQTextEdit"); TQPalette objectPalette = tqApp->palette(objectTypes); // stream << parse_rc_string("background-color: " + colorString(objectPalette.color(TQPalette::Active, TQColorGroup::Base)), "GtkTextView"); // stream << parse_rc_string("background-color: " + colorString(objectPalette.color(TQPalette::Disabled, TQColorGroup::Base)), "GtkTextView:insensitive"); @@ -973,7 +973,7 @@ void writeGtkThemeControlFile(int forceRecreate) { int tdeMenuFrameWidth; { TQStringList objectTypes; - objectTypes.append(TQPOPUPMENU_OBJECT_NAME_STRING); + objectTypes.append("TQPopupMenu"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; -- cgit v1.2.3