diff options
| author | Manolo Gouy <Manolo> | 2016-04-16 12:05:55 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-04-16 12:05:55 +0000 |
| commit | d3e2a88c09a290f709aae843a9d4ce95ab629347 (patch) | |
| tree | ecba4c2a53df5877bc30ff0cf7a44e3aa3e4ff59 /src | |
| parent | d3d7597484394d43f9b88dbdcfa2e993d14621d3 (diff) | |
Continue removing non window-related member-functions from class Fl_X.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11631 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_x.cxx | 2 | ||||
| -rw-r--r-- | src/drivers/X11/Fl_X11_Screen_Driver.H | 1 | ||||
| -rw-r--r-- | src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 5a784be71..9f45072df 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -1024,7 +1024,7 @@ static unsigned char *create_bmp(const unsigned char *data, int W, int H, int *r } // takes a raw RGB image and puts it in the copy/paste buffer -void Fl_X::copy_image(const unsigned char *data, int W, int H, int clipboard){ +void Fl_X11_Screen_Driver::copy_image(const unsigned char *data, int W, int H, int clipboard){ if (!data || W <= 0 || H <= 0) return; delete[] fl_selection_buffer[clipboard]; fl_selection_buffer[clipboard] = (char *) create_bmp(data,W,H,&fl_selection_length[clipboard]); diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.H b/src/drivers/X11/Fl_X11_Screen_Driver.H index cc202e881..bf7aca3c2 100644 --- a/src/drivers/X11/Fl_X11_Screen_Driver.H +++ b/src/drivers/X11/Fl_X11_Screen_Driver.H @@ -45,6 +45,7 @@ protected: public: static int ewmh_supported(); + static void copy_image(const unsigned char* data, int W, int H, int destination); // --- display management virtual void display(const char *disp); virtual int visual(int flags); diff --git a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx index e665bc9ea..2c31e109d 100644 --- a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx @@ -24,6 +24,7 @@ #include <FL/x.H> #include <FL/fl_draw.H> #include "Fl_Translated_Xlib_Graphics_Driver.H" +#include "../X11/Fl_X11_Screen_Driver.H" class Fl_Xlib_Copy_Surface_Driver : public Fl_Copy_Surface_Driver { friend class Fl_Copy_Surface_Driver; @@ -69,7 +70,7 @@ Fl_Xlib_Copy_Surface_Driver::~Fl_Xlib_Copy_Surface_Driver() { unsigned char *data = fl_read_image(NULL,0,0,width,height,0); fl_window = oldwindow; _ss->set_current(); - Fl_X::copy_image(data,width,height,1); + Fl_X11_Screen_Driver::copy_image(data, width, height, 1); delete[] data; fl_delete_offscreen(xid); } |