Author: manolo
Date: 2010-04-21 04:48:48 -0700 (Wed, 21 Apr 2010)
New Revision: 7552
Log:
Removed further compilation warnings.
Modified:
branches/branch-1.3-Fl_Printer/FL/Fl_Device.H
branches/branch-1.3-Fl_Printer/FL/Fl_PSfile_Device.H
branches/branch-1.3-Fl_Printer/src/Fl_PS_Printer.cxx
Modified: branches/branch-1.3-Fl_Printer/FL/Fl_Device.H
===================================================================
--- branches/branch-1.3-Fl_Printer/FL/Fl_Device.H 2010-04-20 21:43:31 UTC
(rev 7551)
+++ branches/branch-1.3-Fl_Printer/FL/Fl_Device.H 2010-04-21 11:48:48 UTC
(rev 7552)
@@ -165,6 +165,8 @@
friend void fl_draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int
W,int H, int D);
friend FL_EXPORT void fl_draw_image_mono(Fl_Draw_Image_Cb cb, void* data,
int X,int Y,int W,int H, int D);
+ /** \brief The constructor. */
+ Fl_Graphics_Driver() {};
/** \brief see fl_rect(int x, int y, int w, int h). */
virtual void rect(int x, int y, int w, int h);
/** \brief see fl_rectf(int x, int y, int w, int h). */
@@ -284,9 +286,8 @@
public:
static const char *device_type;
-
- Fl_Graphics_Driver() {};
-
+ /** \brief The destructor */
+ virtual ~Fl_Graphics_Driver() {};
};
#if defined(__APPLE__) || defined(FL_DOXYGEN)
Modified: branches/branch-1.3-Fl_Printer/FL/Fl_PSfile_Device.H
===================================================================
--- branches/branch-1.3-Fl_Printer/FL/Fl_PSfile_Device.H 2010-04-20
21:43:31 UTC (rev 7551)
+++ branches/branch-1.3-Fl_Printer/FL/Fl_PSfile_Device.H 2010-04-21
11:48:48 UTC (rev 7552)
@@ -228,7 +228,6 @@
void draw(Fl_Bitmap * bitmap,int XP, int YP, int WP, int HP, int cx, int cy);
public:
- Fl_PostScript_Graphics_Driver();
void page_policy(int p);
int page_policy(){return page_policy_;};
void close_command( int (*cmd)(FILE *)){close_cmd_=cmd;};
@@ -244,6 +243,8 @@
void place(double x, double y, double tx, double ty, double scale = 1);
#endif // FL_DOXYGEN
+ Fl_PostScript_Graphics_Driver();
+ ~Fl_PostScript_Graphics_Driver();
};
/**
Modified: branches/branch-1.3-Fl_Printer/src/Fl_PS_Printer.cxx
===================================================================
--- branches/branch-1.3-Fl_Printer/src/Fl_PS_Printer.cxx 2010-04-20
21:43:31 UTC (rev 7551)
+++ branches/branch-1.3-Fl_Printer/src/Fl_PS_Printer.cxx 2010-04-21
11:48:48 UTC (rev 7552)
@@ -52,6 +52,11 @@
bg_r = bg_g = bg_b = 255;
}
+/** \brief The destructor. */
+Fl_PostScript_Graphics_Driver::~Fl_PostScript_Graphics_Driver() {
+ if(ps_filename_) free(ps_filename_);
+}
+
/**
@brief The constructor.
*/
@@ -125,9 +130,7 @@
*/
Fl_PostScript_File_Device::~Fl_PostScript_File_Device() {
Fl_PostScript_Graphics_Driver *ps = driver();
- if (ps->ps_filename_) free(ps->ps_filename_);
- Fl_Graphics_Driver *gd = driver();
- if (gd) delete gd;
+ if (ps) delete ps;
}
#ifndef FL_DOXYGEN
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
