From 86e0dfa3e11957318ca4f3f549248326aa806eb4 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Mon, 3 May 2004 15:47:39 +0000 Subject: [PATCH] ... and sanitize the simplified code... git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8730 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/XFormsToolbar.C | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/frontends/xforms/XFormsToolbar.C b/src/frontends/xforms/XFormsToolbar.C index 75f457b889..5fef865c86 100644 --- a/src/frontends/xforms/XFormsToolbar.C +++ b/src/frontends/xforms/XFormsToolbar.C @@ -162,7 +162,6 @@ void XFormsToolbar::toolbarItem::generateInactivePixmaps() // "o c ", // "oooooooooooooooo", // 'o' chars. // repeated times. - std::ostringstream line1_ss; line1_ss << width << ' ' << height << " 1 1"; string const line1 = line1_ss.str(); @@ -173,20 +172,15 @@ void XFormsToolbar::toolbarItem::generateInactivePixmaps() inactive_data[0] = const_cast(line1.c_str()); inactive_data[1] = const_cast(line2.c_str()); - char ** raw_inactive_data = - const_cast(&*inactive_data.begin()); + char ** raw_inactive_data = &*inactive_data.begin(); // Generate a pixmap of this data set. // Together with 'mask' above, this is sufficient to display // an inactive version of our active_pixmap. Screen * screen = ScreenOfDisplay(display, fl_screen); - XpmCreatePixmapFromData(fl_get_display(), - XRootWindowOfScreen(screen), - raw_inactive_data, - &inactive_pixmap, - 0, - 0); + XpmCreatePixmapFromData(display, XRootWindowOfScreen(screen), + raw_inactive_data, &inactive_pixmap, 0, 0); } -- 2.39.5