From 0c31411df9ef94e68c94462529d95e4fef092477 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Thu, 3 Nov 2016 21:28:09 +0000 Subject: Rename Fl_Bitmap::start() to Fl_Bitmap::prepare(). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@12078 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_Bitmap.H | 2 +- FL/Fl_Graphics_Driver.H | 4 ++-- src/Fl_Bitmap.cxx | 2 +- src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx | 4 ++-- src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx | 2 +- src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/FL/Fl_Bitmap.H b/FL/Fl_Bitmap.H index bea76a309..4d4172e92 100644 --- a/FL/Fl_Bitmap.H +++ b/FL/Fl_Bitmap.H @@ -41,7 +41,7 @@ public: int alloc_array; private: - int start(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); /** for internal use */ fl_uintptr_t id_; diff --git a/FL/Fl_Graphics_Driver.H b/FL/Fl_Graphics_Driver.H index 02aab1a9a..8ec8f9006 100644 --- a/FL/Fl_Graphics_Driver.H +++ b/FL/Fl_Graphics_Driver.H @@ -145,9 +145,9 @@ protected: static fl_uintptr_t* mask(Fl_Pixmap *pm) {return &(pm->mask_);} static Fl_Color* pixmap_bg_color(Fl_Pixmap *pm) {return &(pm->pixmap_bg_color);} static void draw_empty(Fl_Image* img, int X, int Y) {img->draw_empty(X, Y);} - static int start(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int &cx, int &cy, + static int prepare(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int &cx, int &cy, int &X, int &Y, int &W, int &H) { - return bm->start(XP,YP,WP,HP,cx,cy,X,Y,W,H); + return bm->prepare(XP,YP,WP,HP,cx,cy,X,Y,W,H); } static int prepare(Fl_Pixmap *pm, int XP, int YP, int WP, int HP, int &cx, int &cy, int &X, int &Y, int &W, int &H) { diff --git a/src/Fl_Bitmap.cxx b/src/Fl_Bitmap.cxx index 4606f05e3..d9c315152 100644 --- a/src/Fl_Bitmap.cxx +++ b/src/Fl_Bitmap.cxx @@ -114,7 +114,7 @@ void Fl_Bitmap::draw(int XP, int YP, int WP, int HP, int cx, int cy) { fl_graphics_driver->draw(this, XP, YP, WP, HP, cx, cy); } -int Fl_Bitmap::start(int XP, int YP, int WP, int HP, int &cx, int &cy, +int Fl_Bitmap::prepare(int XP, int YP, int WP, int HP, int &cx, int &cy, int &X, int &Y, int &W, int &H) { if (!array) { diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx index 4f7e1beb0..391474183 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx @@ -401,7 +401,7 @@ void Fl_GDI_Graphics_Driver::delete_bitmask(Fl_Bitmask bm) { void Fl_GDI_Graphics_Driver::draw(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy) { int X, Y, W, H; - if (Fl_Graphics_Driver::start(bm, XP, YP, WP, HP, cx, cy, X, Y, W, H)) { + if (Fl_Graphics_Driver::prepare(bm, XP, YP, WP, HP, cx, cy, X, Y, W, H)) { return; } @@ -429,7 +429,7 @@ void Fl_GDI_Printer_Graphics_Driver::draw(Fl_Bitmap *bm, int XP, int YP, int WP, Fl_GDI_Graphics_Driver::draw(bm, XP, YP, WP, HP, cx, cy); return; } - if (Fl_Graphics_Driver::start(bm, XP, YP, WP, HP, cx, cy, X, Y, W, H)) { + if (Fl_Graphics_Driver::prepare(bm, XP, YP, WP, HP, cx, cy, X, Y, W, H)) { return; } diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx index ef64204a1..ccead45b5 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx @@ -133,7 +133,7 @@ void fl_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b) { void Fl_Quartz_Graphics_Driver::draw(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy) { int X, Y, W, H; - if (Fl_Graphics_Driver::start(bm, XP, YP, WP, HP, cx, cy, X, Y, W, H)) { + if (Fl_Graphics_Driver::prepare(bm, XP, YP, WP, HP, cx, cy, X, Y, W, H)) { return; } if (*Fl_Graphics_Driver::id(bm) && gc_) { diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx index 82d35f515..3a046ef95 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx @@ -614,7 +614,7 @@ void Fl_Xlib_Graphics_Driver::delete_bitmask(Fl_Bitmask bm) { void Fl_Xlib_Graphics_Driver::draw(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy) { int X, Y, W, H; - if (Fl_Graphics_Driver::start(bm, XP, YP, WP, HP, cx, cy, X, Y, W, H)) { + if (Fl_Graphics_Driver::prepare(bm, XP, YP, WP, HP, cx, cy, X, Y, W, H)) { return; } -- cgit v1.2.3