gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Fl_Bitmap::start() to Fl_Bitmap::prepare().

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@12078 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2016-11-03 21:28:09 +00:00
parent 95a9edcb55
commit 0c31411df9
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FL/Fl_Bitmap.H
View File

@ -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_;

4
FL/Fl_Graphics_Driver.H
View File

@ -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) {

2
src/Fl_Bitmap.cxx
View File

@ -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) {

4
src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx
View File

@ -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;
}

2
src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx
View File

@ -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_) {

2
src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
View File

@ -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;
}