summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>1998-12-03 13:28:21 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>1998-12-03 13:28:21 +0000
commit5fea9312add860d875fb0b43e22a90daf83dfc69 (patch)
tree98b226e07e63df8f04776ec1ca067d6c5e4e6227 /src
parentbe689f989a6c0a63658f80d7f101ad3d597c163d (diff)
One last Pixmap fix from Matthias.
git-svn-id: file:///fltk/svn/fltk/trunk@125 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Pixmap.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Fl_Pixmap.cxx b/src/Fl_Pixmap.cxx
index 56d178b35..f82a32d15 100644
--- a/src/Fl_Pixmap.cxx
+++ b/src/Fl_Pixmap.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Pixmap.cxx,v 1.4 1998/10/21 14:20:16 mike Exp $"
+// "$Id: Fl_Pixmap.cxx,v 1.5 1998/12/03 13:28:21 mike Exp $"
//
// Pixmap drawing code for the Fast Light Tool Kit (FLTK).
//
@@ -42,7 +42,10 @@ void fl_restore_clip(); // in fl_rect.C
void Fl_Pixmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
// ignore empty or bad pixmap data:
- if (w<0) fl_measure_pixmap(data, w, h);
+ if (w<0) {
+ fl_measure_pixmap(data, w, h);
+ if (WP==-1) { WP = w; HP = h; } // correct the default setting
+ }
if (!w) return;
// account for current clip region (faster on Irix):
int X,Y,W,H; fl_clip_box(XP,YP,WP,HP,X,Y,W,H);
@@ -140,5 +143,5 @@ void Fl_Pixmap::label(Fl_Menu_Item* o) {
}
//
-// End of "$Id: Fl_Pixmap.cxx,v 1.4 1998/10/21 14:20:16 mike Exp $".
+// End of "$Id: Fl_Pixmap.cxx,v 1.5 1998/12/03 13:28:21 mike Exp $".
//