anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Andres fixes to sstrem problems

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@692 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Vigna 2000-04-26 08:46:05 +00:00
parent c6150425e5
commit 9e5bd1d609
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2000-04-26 Juergen Vigna <jug@sad.it>
* src/insets/figinset.C: fixes to Lars sstream changes!
2000-04-23 Dekel Tsur <dekel@math.tau.ac.il>
* A lot of files: Added Ascii(ostream &) methods to all inset

30
src/insets/figinset.C
View File

@ -72,7 +72,9 @@ using std::vector;
using std::find;
using std::flush;
using std::endl;
#ifdef HAVE_SSTREAM
using std::ostringstream;
#endif
extern BufferView * current_view;
extern FL_OBJECT * figinset_canvas;
@ -540,12 +542,12 @@ void runqueue()
ostringstream t2;
#else
char tbuf2[80];
ostrstream t2(tbuf2, sizeof(tbuf));
ostrstream t2(tbuf2, sizeof(tbuf2));
#endif
t2 << "GHOSTVIEW=" << fl_get_canvas_id(figinset_canvas)
<< ' ' << p->data->bitmap;
#ifndef HAVE_SSTREAM
<< '\0';
t2 << '\0';
#endif
// now set up ghostview property on a window
// #warning BUG seems that the only bug here
@ -559,7 +561,7 @@ void runqueue()
t1 << "0 0 0 0 " << p->data->wid << ' '
<< p->data->hgh << " 72 72 0 0 0 0";
#ifndef HAVE_SSTREAM
<< '\0';
t1 << '\0';
#endif
if (lyxerr.debugging()) {
@ -614,16 +616,22 @@ void runqueue()
XInternAtom(tempdisp, "GHOSTVIEW", false),
XInternAtom(tempdisp, "STRING", false),
8, PropModeAppend,
#ifdef HAVE_SSTREAM
reinterpret_cast<unsigned char*>(const_cast<char*>(t1.str().c_str())),
t1.str().size());
t1.str().size()
#else
reinterpret_cast<unsigned char*>(const_cast<char*>(t1.str())),
strlen(t1.str())
#endif
);
XUngrabServer(tempdisp);
XFlush(tempdisp);
#ifdef HAVE_SSTREAM
ostringstream t3;
#else
char tbuf[384];
ostrstream t3(tbuf, sizeof(tbuf));
char tbuf3[384];
ostrstream t3(tbuf3, sizeof(tbuf3));
#endif
switch (p->data->flags & 3) {
case 0: t3 << 'H'; break; // Hidden
@ -640,7 +648,7 @@ void runqueue()
t3 << ' ' << BlackPixelOfScreen(DefaultScreenOfDisplay(tempdisp))
<< ' ' << background_pixel;
#ifndef HAVE_SSTREAM
<< '\0';
t3 << '\0';
#endif
XGrabServer(tempdisp);
@ -650,8 +658,14 @@ void runqueue()
"GHOSTVIEW_COLORS", false),
XInternAtom(tempdisp, "STRING", false),
8, PropModeReplace,
#ifdef HAVE_SSTREAM
reinterpret_cast<unsigned char*>(const_cast<char*>(t3.str().c_str())),
t3.str().size());
t3.str().size()
#else
reinterpret_cast<unsigned char*>(const_cast<char*>(t3.str())),
strlen(t3.str())
#endif
);
XUngrabServer(tempdisp);
XFlush(tempdisp);