diff options
Diffstat (limited to 'kexi/plugins')
| -rw-r--r-- | kexi/plugins/forms/widgets/kexidbcombobox.cpp | 4 | ||||
| -rw-r--r-- | kexi/plugins/forms/widgets/kexidbimagebox.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp index d9e33b9b..088d0a48 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp @@ -161,7 +161,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * ) p.fillRect( editorGeometry, cg.brush( TQColorGroup::Highlight ) ); TQRect r( TQStyle::visualRect( style().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) ); r = TQRect(r.left()-1, r.top()-1, r.width()+2, r.height()+2); //enlare by 1 pixel each side to avoid covering by the subwidget - style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, + style().drawPrimitive( TQStyle::PE_FocusRect, &p, r, cg, flags | TQStyle::Style_FocusAtBorder, TQStyleOption(cg.highlight())); } //todo @@ -508,7 +508,7 @@ TQSize KexiDBComboBox::sizeHint() const const int maxWidth = 7 * fontMetrics().width(TQChar('x')) + 18; const int maxHeight = TQMAX( fontMetrics().lineSpacing(), 14 ) + 2; - d->sizeHint = (style().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo, + d->sizeHint = (style().sizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo, TQSize(maxWidth, maxHeight)).expandedTo(TQApplication::globalStrut())); return d->sizeHint; diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index f205de05..4c23fead 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -685,7 +685,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe ) // if the widget is focused, draw focus indicator rect _if_ there is no chooser button if (!m_designMode && !dataSource().isEmpty() && hasFocus() && (!m_chooser || !m_chooser->isVisible())) { - style().tqdrawPrimitive( + style().drawPrimitive( TQStyle::PE_FocusRect, &p, style().subRect(TQStyle::SR_PushButtonContents, this), palette().active() ); } |