anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-05 13:26:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove setPixmap and use the backend instead

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6739 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2003-04-08 19:35:02 +00:00
parent aa3acd6358
commit a2eb2cb918
2 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,8 @@
2003-04-08 John Levon <levon@movementarian.org>
* Toolbar_pimpl.C: remove setPixmap, use the backend
instead.
2003-04-08 John Levon <levon@movementarian.org>
* Toolbar_pimpl.C: handle tooltip

39
src/frontends/xforms/Toolbar_pimpl.C
View File

@ -263,41 +263,6 @@ void C_Toolbar_ToolbarCB(FL_OBJECT * ob, long data)
}
void setPixmap(FL_OBJECT * obj, int action)
{
string xpm_name;
FuncRequest ev = lyxaction.retrieveActionArg(action);
string const name = lyxaction.getActionName(ev.action);
if (!ev.argument.empty())
xpm_name = subst(name + ' ' + ev.argument, ' ','_');
else
xpm_name = name;
string fullname = LibFileSearch("images", xpm_name, "xpm");
if (ev.action == LFUN_INSERT_MATH && !ev.argument.empty()) {
string arg = ev.argument.substr(1);
fullname = LibFileSearch("images/math/", arg, "xpm");
}
if (!fullname.empty()) {
lyxerr[Debug::GUI] << "Full icon name is `"
<< fullname << '\'' << endl;
fl_set_pixmapbutton_file(obj, fullname.c_str());
return;
}
lyxerr << "Unable to find icon `" << xpm_name << '\'' << endl;
fullname = LibFileSearch("images", "unknown", "xpm");
if (!fullname.empty()) {
lyxerr[Debug::GUI] << "Using default `unknown' icon"
<< endl;
fl_set_pixmapbutton_file(obj, fullname.c_str());
}
}
} // namespace anon
@ -353,7 +318,9 @@ void Toolbar::Pimpl::add(int action, string const & tooltip)
// The view that this object belongs to.
obj->u_vdata = owner_;
setPixmap(obj, action);
string const xpm = toolbarbackend.getIcon(action);
fl_set_pixmapbutton_file(obj, xpm.c_str());
// we must remember to update the positions
xpos += buttonwidth;
// ypos is constant