summaryrefslogtreecommitdiff
authorJens-Heiner Rechtien <hr@openoffice.org>2006-01-27 12:50:07 (GMT)
committer Jens-Heiner Rechtien <hr@openoffice.org>2006-01-27 12:50:07 (GMT)
commit11df3ef7672de6b80fa91a3ea7ae528dda5bfc16 (patch) (side-by-side diff)
tree9d52db90d04de8bcabee9bdd82262aa253b5ffcc
parent5083f863d28e78c12d17e618b5529ec86d4d1f6f (diff)
downloadcore-11df3ef7672de6b80fa91a3ea7ae528dda5bfc1.zip
core-11df3ef7672de6b80fa91a3ea7ae528dda5bfc1.tar.gz
INTEGRATION: CWS vcl51 (1.18.76); FILE MERGED
2006/01/12 13:33:20 pl 1.18.76.1: #i59666# patch from cmc for animated themes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx16
1 files changed, 11 insertions, 5 deletions
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 11c0412..30510dc 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: salnativewidgets-gtk.cxx,v $
*
- * $Revision: 1.21 $
+ * $Revision: 1.22 $
*
- * last change: $Author: hr $ $Date: 2006-01-26 18:11:08 $
+ * last change: $Author: hr $ $Date: 2006-01-27 13:50:07 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -1137,9 +1137,15 @@ BOOL GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable,
// GTK enforces radio groups, so that if we don't have 2 buttons in the group,
// the single button will always be active. So we have to have 2 buttons.
+
+ // #i59666# set the members directly where we should use
+ // gtk_toggle_button_set_active. reason: there are animated themes
+ // which are in active state only after a while leading to painting
+ // intermediate states between active/inactive. Let's hope that
+ // GtkToggleButtone stays binary compatible.
if (!isChecked)
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(gRadioWidgetSibling), TRUE );
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(gRadioWidget), isChecked );
+ GTK_TOGGLE_BUTTON(gRadioWidgetSibling)->active = TRUE;
+ GTK_TOGGLE_BUTTON(gRadioWidget)->active = isChecked;
for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
{
@@ -1185,7 +1191,7 @@ BOOL GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable,
// Set the shadow based on if checked or not so we get a checkmark.
shadowType = isChecked ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
NWSetWidgetState( gCheckWidget, nState, stateType );
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(gCheckWidget), isChecked );
+ GTK_TOGGLE_BUTTON(gCheckWidget)->active = isChecked;
for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
{