From 55f52d26e49612481ff30efcfc7303f7c503202d Mon Sep 17 00:00:00 2001 From: Mirek Fidler Date: Tue, 19 Nov 2024 14:05:00 +0100 Subject: [PATCH] RichEditWithToolBar::Skin --- uppsrc/CtrlLib/TabCtrl.cpp | 1 - uppsrc/Draw/Cham.cpp | 1 - uppsrc/RichEdit/Editor.cpp | 5 +++++ uppsrc/RichEdit/RichEdit.h | 4 ++++ upptst/RichTextNumbering/main.cpp | 2 +- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/uppsrc/CtrlLib/TabCtrl.cpp b/uppsrc/CtrlLib/TabCtrl.cpp index 2325171d4..aaadd1af8 100644 --- a/uppsrc/CtrlLib/TabCtrl.cpp +++ b/uppsrc/CtrlLib/TabCtrl.cpp @@ -4,7 +4,6 @@ namespace Upp { CH_STYLE(TabCtrl, Style, StyleDefault) { - DLOG("TabCtrl style"); font = StdFont(); tabheight = font.Info().GetHeight() + 8; margin = 2; diff --git a/uppsrc/Draw/Cham.cpp b/uppsrc/Draw/Cham.cpp index a67d97985..0ecfb9629 100644 --- a/uppsrc/Draw/Cham.cpp +++ b/uppsrc/Draw/Cham.cpp @@ -417,7 +417,6 @@ void ChReset() void ChFinish() { - DLOG("-- chFinish"); sChInvalid = false; for(int i = 0; i < sChStyle().GetCount(); i++) sChStyle()[i].init(); diff --git a/uppsrc/RichEdit/Editor.cpp b/uppsrc/RichEdit/Editor.cpp index de818f455..fa92ecfcd 100644 --- a/uppsrc/RichEdit/Editor.cpp +++ b/uppsrc/RichEdit/Editor.cpp @@ -768,6 +768,11 @@ void RichEditWithToolBar::RefreshBar() toolbar.Set(THISBACK(TheBar)); } +void RichEditWithToolBar::Skin() +{ + RefreshBar(); +} + void RichEdit::EvaluateFields() { WhenStartEvaluating(); diff --git a/uppsrc/RichEdit/RichEdit.h b/uppsrc/RichEdit/RichEdit.h index c73711525..e901dfab0 100644 --- a/uppsrc/RichEdit/RichEdit.h +++ b/uppsrc/RichEdit/RichEdit.h @@ -855,6 +855,10 @@ public: }; class RichEditWithToolBar : public RichEdit { +public: + virtual void Skin(); + +private: ToolBar toolbar; bool extended; void RefreshBar(); diff --git a/upptst/RichTextNumbering/main.cpp b/upptst/RichTextNumbering/main.cpp index bfead0f3c..f422759ca 100644 --- a/upptst/RichTextNumbering/main.cpp +++ b/upptst/RichTextNumbering/main.cpp @@ -15,5 +15,5 @@ GUI_APP_MAIN win.Add(edit.SizePos()); win.Run(); - DDUMP(AsCString(edit.GetQTF())); + RDUMP(AsCString(edit.GetQTF())); }