anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-08 10:51:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

... and sanitize the simplified code...

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8730 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2004-05-03 15:47:39 +00:00
parent c688967bc3
commit 86e0dfa3e1
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/frontends/xforms/XFormsToolbar.C
View File

@ -162,7 +162,6 @@ void XFormsToolbar::toolbarItem::generateInactivePixmaps()
// "o c <inactive_color>", // "o c <inactive_color>",
// "oooooooooooooooo", // <width> 'o' chars. // "oooooooooooooooo", // <width> 'o' chars.
// repeated <height> times. // repeated <height> times.
std::ostringstream line1_ss; std::ostringstream line1_ss;
line1_ss << width << ' ' << height << " 1 1"; line1_ss << width << ' ' << height << " 1 1";
string const line1 = line1_ss.str(); string const line1 = line1_ss.str();
@ -173,20 +172,15 @@ void XFormsToolbar::toolbarItem::generateInactivePixmaps()
inactive_data[0] = const_cast<char *>(line1.c_str()); inactive_data[0] = const_cast<char *>(line1.c_str());
inactive_data[1] = const_cast<char *>(line2.c_str()); inactive_data[1] = const_cast<char *>(line2.c_str());
char ** raw_inactive_data = char ** raw_inactive_data = &*inactive_data.begin();
const_cast<char **>(&*inactive_data.begin());
// Generate a pixmap of this data set. // Generate a pixmap of this data set.
// Together with 'mask' above, this is sufficient to display // Together with 'mask' above, this is sufficient to display
// an inactive version of our active_pixmap. // an inactive version of our active_pixmap.
Screen * screen = ScreenOfDisplay(display, fl_screen); Screen * screen = ScreenOfDisplay(display, fl_screen);
XpmCreatePixmapFromData(fl_get_display(), XpmCreatePixmapFromData(display, XRootWindowOfScreen(screen),
XRootWindowOfScreen(screen), raw_inactive_data, &inactive_pixmap, 0, 0);
raw_inactive_data,
&inactive_pixmap,
0,
0);
} }