Merge branch 'fltk:master' into master

2 files changed, 8 insertions, 10 deletions

diff --git a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H
index aff73c4f2..7237028fd 100644
--- a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H
+++ b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H
@@ -44,17 +44,13 @@ public:
   };
   Clip * clip_;
 
-  int lang_level_;
   int gap_;
-  int pages_;
   cairo_t *cr() { return cairo_; }
   PangoLayout *pango_layout() {return pango_layout_;}
 
   void check_status(void);
 
   enum SHAPE shape_;
-  int linewidth_;// need for clipping, lang level 1-2
-  int linestyle_;//
   unsigned char cr_,cg_,cb_;
   char  linedash_[256];//should be enough
   void concat();  // transform ror scalable dradings...
@@ -68,9 +64,6 @@ public:
   int left_margin;
   int top_margin;
 
-  double pw_, ph_;
-
-  uchar bg_r, bg_g, bg_b;
   void transformed_draw(const char* s, int n, double x, double y); //precise text placing
 
   // implementation of drawing methods
diff --git a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx
index f6db07cda..df7ea100c 100644
--- a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx
+++ b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx
@@ -64,7 +64,14 @@ static void draw_image_cb(void *data, int x, int y, int w, uchar *buf) {
 }
 
 
-Fl_Cairo_Graphics_Driver::Fl_Cairo_Graphics_Driver() : Fl_Graphics_Driver() {}
+Fl_Cairo_Graphics_Driver::Fl_Cairo_Graphics_Driver() : Fl_Graphics_Driver() {
+  cairo_ = NULL;
+  pango_layout_ = NULL;
+  clip_ = NULL;
+  scale_x = scale_y = 1;
+  angle = 0;
+  left_margin = top_margin = 0;
+}
 
 Fl_Cairo_Graphics_Driver::~Fl_Cairo_Graphics_Driver() {}
 
@@ -192,8 +199,6 @@ void Fl_Cairo_Graphics_Driver::polygon(int x0, int y0, int x1, int y1, int x2, i
 }
 
 void Fl_Cairo_Graphics_Driver::line_style(int style, int width, char* dashes) {
-  linewidth_=width;
-  linestyle_=style;
   if(dashes){
     if(dashes != linedash_)
       strcpy(linedash_,dashes);