diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-08-06 23:51:39 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-08-06 23:51:39 +0000 |
| commit | 9ab0bb195e8f79568c2a52fa4ebd287b1686ccaa (patch) | |
| tree | 16b50763c44ee92024edb01f20cbe60041f98fcd /src | |
| parent | 45010ee2fe988e00930e43713802c870c2bdecf2 (diff) | |
WIN32 updates to make the DLL project work again...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1563 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Pixmap.cxx | 6 | ||||
| -rw-r--r-- | src/Fl_Text_Display.cxx | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/Fl_Pixmap.cxx b/src/Fl_Pixmap.cxx index df0e029a6..77146622a 100644 --- a/src/Fl_Pixmap.cxx +++ b/src/Fl_Pixmap.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.1 2001/08/05 23:58:54 easysw Exp $" +// "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.2 2001/08/06 23:51:39 easysw Exp $" // // Pixmap drawing code for the Fast Light Tool Kit (FLTK). // @@ -91,7 +91,7 @@ void Fl_Pixmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) { int Bpr = (bpp*w()+7)/8; //: bytes per row int pad = Bpr&1, w1 = (w()+7)/8, shr = ((w()-1)&7)+1; if (bpp==4) shr = (shr+1)/2; - uchar *newarray = new uchar[(Bpr+pad)*h], *dst = newarray, *src = bitmap; + uchar *newarray = new uchar[(Bpr+pad)*h()], *dst = newarray, *src = bitmap; for (int i=0; i<h(); i++) { //: this is slooow, but we do it only once per pixmap for (int j=w1; j>0; j--) { @@ -178,5 +178,5 @@ void Fl_Pixmap::label(Fl_Menu_Item* m) { } // -// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.1 2001/08/05 23:58:54 easysw Exp $". +// End of "$Id: Fl_Pixmap.cxx,v 1.9.2.4.2.2 2001/08/06 23:51:39 easysw Exp $". // diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx index 2ad16824a..fb9242be5 100644 --- a/src/Fl_Text_Display.cxx +++ b/src/Fl_Text_Display.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Text_Display.cxx,v 1.12.2.1 2001/08/04 12:21:33 easysw Exp $" +// "$Id: Fl_Text_Display.cxx,v 1.12.2.2 2001/08/06 23:51:39 easysw Exp $" // // Copyright Mark Edel. Permission to distribute under the LGPL for // the FLTK library granted by Mark Edel. @@ -205,8 +205,8 @@ void Fl_Text_Display::resize(int X, int Y, int W, int H) { mMaxsize = max(mMaxsize, fl_height(mStyleTable[i].font, mStyleTable[i].size)); // did we have scrollbars initially? - bool hscrollbarvisible = mHScrollBar->visible(); - bool vscrollbarvisible = mVScrollBar->visible(); + int hscrollbarvisible = mHScrollBar->visible(); + int vscrollbarvisible = mVScrollBar->visible(); // try without scrollbars first mVScrollBar->clear_visible(); @@ -1948,5 +1948,5 @@ int Fl_Text_Display::handle(int event) { // -// End of "$Id: Fl_Text_Display.cxx,v 1.12.2.1 2001/08/04 12:21:33 easysw Exp $". +// End of "$Id: Fl_Text_Display.cxx,v 1.12.2.2 2001/08/06 23:51:39 easysw Exp $". // |