Fix STR#2831: regression in Fl_Pixmap drawing under X11.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9421 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2012-05-01 14:33:30 +00:00
parent 0d214036bc
commit 1229ac8808
2 changed files with 2 additions and 2 deletions

View File

@ -46,7 +46,7 @@ class FL_EXPORT Fl_Pixmap : public Fl_Image {
void copy_data();
void delete_data();
void set_data(const char * const *p);
int prepare(int XP, int YP, int WP, int HP, int cx, int cy,
int prepare(int XP, int YP, int WP, int HP, int &cx, int &cy,
int &X, int &Y, int &W, int &H);
protected:

View File

@ -92,7 +92,7 @@ static int start(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int w, int h, i
return 0;
}
int Fl_Pixmap::prepare(int XP, int YP, int WP, int HP, int cx, int cy,
int Fl_Pixmap::prepare(int XP, int YP, int WP, int HP, int &cx, int &cy,
int &X, int &Y, int &W, int &H) {
if (w() < 0) measure();
int code = start(this, XP, YP, WP, HP, w(), h(), cx, cy, X, Y, W, H);