From 2646b83cbf2257fbc536055237ced97fd9f091ce Mon Sep 17 00:00:00 2001 From: cxl Date: Tue, 27 May 2014 12:52:08 +0000 Subject: [PATCH] CtrlLib: Text icons #765 git-svn-id: svn://ultimatepp.org/upp/trunk@7399 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CodeEditor/CodeEditor.cpp | 2 +- uppsrc/CtrlLib/Text.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/uppsrc/CodeEditor/CodeEditor.cpp b/uppsrc/CodeEditor/CodeEditor.cpp index eec4509ba..a7e84cd3a 100644 --- a/uppsrc/CodeEditor/CodeEditor.cpp +++ b/uppsrc/CodeEditor/CodeEditor.cpp @@ -2,7 +2,7 @@ NAMESPACE_UPP -#define LLOG(x) // RLOG(x) +#define LLOG(x) // DLOG(x) #define LTIMING(x) // RTIMING(x) #define IMAGEVECTOR Vector diff --git a/uppsrc/CtrlLib/Text.cpp b/uppsrc/CtrlLib/Text.cpp index d86770980..74f9342d9 100644 --- a/uppsrc/CtrlLib/Text.cpp +++ b/uppsrc/CtrlLib/Text.cpp @@ -664,10 +664,10 @@ void TextCtrl::Paste() { void TextCtrl::StdBar(Bar& menu) { NextUndo(); if(undosteps) { - menu.Add(undo.GetCount() && IsEditable(), t_("Undo"), THISBACK(Undo)) + menu.Add(undo.GetCount() && IsEditable(), t_("Undo"), CtrlImg::undo(), THISBACK(Undo)) .Key(K_ALT_BACKSPACE) .Key(K_CTRL_Z); - menu.Add(redo.GetCount() && IsEditable(), t_("Redo"), THISBACK(Redo)) + menu.Add(redo.GetCount() && IsEditable(), t_("Redo"), CtrlImg::redo(), THISBACK(Redo)) .Key(K_SHIFT|K_ALT_BACKSPACE) .Key(K_SHIFT_CTRL_Z); menu.Separator();