mirror of
https://github.com/fltk/fltk.git
synced 2026-05-28 03:15:21 +08:00
Fix STR #2514. Removes compilation warnings when using gcc 4.4 with -Wall
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8239 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
+14
-14
@@ -180,17 +180,17 @@ protected:
|
|||||||
/** \brief see fl_line(int x, int y, int x1, int y1, int x2, int y2). */
|
/** \brief see fl_line(int x, int y, int x1, int y1, int x2, int y2). */
|
||||||
virtual void line(int x, int y, int x1, int y1, int x2, int y2);
|
virtual void line(int x, int y, int x1, int y1, int x2, int y2);
|
||||||
/** \brief see fl_draw(const char *str, int n, int x, int y). */
|
/** \brief see fl_draw(const char *str, int n, int x, int y). */
|
||||||
virtual void draw(const char *str, int n, int x, int y) {};
|
virtual void draw(const char *str, int n, int x, int y) = 0;
|
||||||
/** \brief see fl_draw(int angle, const char *str, int n, int x, int y). */
|
/** \brief see fl_draw(int angle, const char *str, int n, int x, int y). */
|
||||||
virtual void draw(int angle, const char *str, int n, int x, int y) {};
|
virtual void draw(int angle, const char *str, int n, int x, int y) = 0;
|
||||||
/** \brief see fl_rtl_draw(const char *str, int n, int x, int y). */
|
/** \brief see fl_rtl_draw(const char *str, int n, int x, int y). */
|
||||||
virtual void rtl_draw(const char *str, int n, int x, int y) {};
|
virtual void rtl_draw(const char *str, int n, int x, int y) = 0;
|
||||||
/** \brief see fl_font(Fl_Font face, Fl_Fontsize size). */
|
/** \brief see fl_font(Fl_Font face, Fl_Fontsize size). */
|
||||||
virtual void font(Fl_Font face, Fl_Fontsize size) {};
|
virtual void font(Fl_Font face, Fl_Fontsize size) = 0;
|
||||||
/** \brief see fl_color(Fl_Color c). */
|
/** \brief see fl_color(Fl_Color c). */
|
||||||
virtual void color(Fl_Color c) {};
|
virtual void color(Fl_Color c) = 0;
|
||||||
/** \brief see fl_color(uchar r, uchar g, uchar b). */
|
/** \brief see fl_color(uchar r, uchar g, uchar b). */
|
||||||
virtual void color(uchar r, uchar g, uchar b) {};
|
virtual void color(uchar r, uchar g, uchar b) = 0;
|
||||||
/** \brief see fl_point(int x, int y). */
|
/** \brief see fl_point(int x, int y). */
|
||||||
virtual void point(int x, int y);
|
virtual void point(int x, int y);
|
||||||
/** \brief see fl_loop(int x0, int y0, int x1, int y1, int x2, int y2). */
|
/** \brief see fl_loop(int x0, int y0, int x1, int y1, int x2, int y2). */
|
||||||
@@ -249,32 +249,32 @@ protected:
|
|||||||
virtual void pop_clip();
|
virtual void pop_clip();
|
||||||
// Images
|
// Images
|
||||||
/** \brief see fl_draw_image(const uchar* buf, int X,int Y,int W,int H, int D, int L). */
|
/** \brief see fl_draw_image(const uchar* buf, int X,int Y,int W,int H, int D, int L). */
|
||||||
virtual void draw_image(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0) {};
|
virtual void draw_image(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0) = 0;
|
||||||
/** \brief see fl_draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D, int L). */
|
/** \brief see fl_draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D, int L). */
|
||||||
virtual void draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0) {};
|
virtual void draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0) = 0;
|
||||||
/** \brief see fl_draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D). */
|
/** \brief see fl_draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D). */
|
||||||
virtual void draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3) {};
|
virtual void draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3) = 0;
|
||||||
/** \brief see fl_draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D). */
|
/** \brief see fl_draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D). */
|
||||||
virtual void draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1) {};
|
virtual void draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1) = 0;
|
||||||
// Image classes
|
// Image classes
|
||||||
/** \brief Draws an Fl_RGB_Image object to the device.
|
/** \brief Draws an Fl_RGB_Image object to the device.
|
||||||
*
|
*
|
||||||
Specifies a bounding box for the image, with the origin (upper left-hand corner) of
|
Specifies a bounding box for the image, with the origin (upper left-hand corner) of
|
||||||
the image offset by the cx and cy arguments.
|
the image offset by the cx and cy arguments.
|
||||||
*/
|
*/
|
||||||
virtual void draw(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy) {};
|
virtual void draw(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy) = 0;
|
||||||
/** \brief Draws an Fl_Pixmap object to the device.
|
/** \brief Draws an Fl_Pixmap object to the device.
|
||||||
*
|
*
|
||||||
Specifies a bounding box for the image, with the origin (upper left-hand corner) of
|
Specifies a bounding box for the image, with the origin (upper left-hand corner) of
|
||||||
the image offset by the cx and cy arguments.
|
the image offset by the cx and cy arguments.
|
||||||
*/
|
*/
|
||||||
virtual void draw(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy) {};
|
virtual void draw(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy) = 0;
|
||||||
/** \brief Draws an Fl_Bitmap object to the device.
|
/** \brief Draws an Fl_Bitmap object to the device.
|
||||||
*
|
*
|
||||||
Specifies a bounding box for the image, with the origin (upper left-hand corner) of
|
Specifies a bounding box for the image, with the origin (upper left-hand corner) of
|
||||||
the image offset by the cx and cy arguments.
|
the image offset by the cx and cy arguments.
|
||||||
*/
|
*/
|
||||||
virtual void draw(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy) {};
|
virtual void draw(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy) = 0;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
static const char *class_id;
|
static const char *class_id;
|
||||||
@@ -416,7 +416,7 @@ public:
|
|||||||
\param x,y offsets where to print relatively to coordinates origin
|
\param x,y offsets where to print relatively to coordinates origin
|
||||||
\param height height of the current drawing area
|
\param height height of the current drawing area
|
||||||
*/
|
*/
|
||||||
virtual int print(Fl_Widget* w, int x, int y, int height) { return 0; }
|
virtual int print(Fl_Widget* w, int x, int y, int height) = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // Fl_Device_H
|
#endif // Fl_Device_H
|
||||||
|
|||||||
Reference in New Issue
Block a user