More Android changes.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12699 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

3 files changed, 54 insertions, 54 deletions

diff --git a/FL/Fl_Graphics_Driver.H b/FL/Fl_Graphics_Driver.H
index 7445eeae3..5839aec1e 100644
--- a/FL/Fl_Graphics_Driver.H
+++ b/FL/Fl_Graphics_Driver.H
@@ -452,81 +452,81 @@ public:
 protected:
   int line_width_;
   void cache_size(Fl_Image *img, int &width, int &height);
-  virtual Fl_Region scale_clip(float f)=0;
+  virtual Fl_Region scale_clip(float f) { return 0; }
   void unscale_clip(Fl_Region r);
   virtual void draw(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy);
-  virtual void draw_unscaled(Fl_Pixmap *pxm, float s, int XP, int YP, int WP, int HP, int cx, int cy)=0;
+  virtual void draw_unscaled(Fl_Pixmap *pxm, float s, 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);
-  virtual void draw_unscaled(Fl_Bitmap *bm, float s, int XP, int YP, int WP, int HP, int cx, int cy)=0;
+  virtual void draw_unscaled(Fl_Bitmap *bm, float s, int XP, int YP, int WP, int HP, int cx, int cy) {}
   virtual void draw(Fl_RGB_Image *img, int XP, int YP, int WP, int HP, int cx, int cy);
-  virtual void draw_unscaled(Fl_RGB_Image *img, float s, int XP, int YP, int WP, int HP, int cx, int cy)=0;
+  virtual void draw_unscaled(Fl_RGB_Image *img, float s, int XP, int YP, int WP, int HP, int cx, int cy) {}
   virtual void draw(Fl_Shared_Image *shared, int X, int Y);
   virtual void point(int x, int y);
-  virtual void point_unscaled(float x, float y) = 0;
+  virtual void point_unscaled(float x, float y) {}
   virtual void rect(int x, int y, int w, int h);
-  virtual void rect_unscaled(float x, float y, float w, float h) = 0;
+  virtual void rect_unscaled(float x, float y, float w, float h) {}
   virtual void rectf(int x, int y, int w, int h);
-  virtual void rectf_unscaled(float x, float y, float w, float h) = 0;
+  virtual void rectf_unscaled(float x, float y, float w, float h) {}
   virtual void line(int x, int y, int x1, int y1);
-  virtual void line_unscaled(float x, float y, float x1, float y1) = 0;
+  virtual void line_unscaled(float x, float y, float x1, float y1) {}
   virtual void line(int x, int y, int x1, int y1, int x2, int y2);
-  virtual void line_unscaled(float x, float y, float x1, float y1, float x2, float y2) = 0;
+  virtual void line_unscaled(float x, float y, float x1, float y1, float x2, float y2) {}
   virtual void xyline(int x, int y, int x1);
   virtual void xyline(int x, int y, int x1, int y2);
   virtual void xyline(int x, int y, int x1, int y2, int x3);
-  virtual void xyline_unscaled(float x, float y, float x1)=0;
+  virtual void xyline_unscaled(float x, float y, float x1) {}
   virtual void yxline(int x, int y, int y1);
   virtual void yxline(int x, int y, int y1, int x2);
   virtual void yxline(int x, int y, int y1, int x2, int y3);
-  virtual void yxline_unscaled(float x, float y, float y1)=0;
+  virtual void yxline_unscaled(float x, float y, float y1) {}
   virtual void loop(int x0, int y0, int x1, int y1, int x2, int y2);
-  virtual void loop_unscaled(float x0, float y0, float x1, float y1, float x2, float y2)=0;
+  virtual void loop_unscaled(float x0, float y0, float x1, float y1, float x2, float y2) {}
   virtual void loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3);
-  virtual void loop_unscaled(float x0, float y0, float x1, float y1, float x2, float y2, float x3, float y3)=0;
+  virtual void loop_unscaled(float x0, float y0, float x1, float y1, float x2, float y2, float x3, float y3) {}
   virtual void polygon(int x0, int y0, int x1, int y1, int x2, int y2);
-  virtual void polygon_unscaled(float x0, float y0, float x1, float y1, float x2, float y2)=0;
+  virtual void polygon_unscaled(float x0, float y0, float x1, float y1, float x2, float y2) {}
   virtual void polygon(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3);
-  virtual void polygon_unscaled(float x0, float y0, float x1, float y1, float x2, float y2, float x3, float y3)=0;
+  virtual void polygon_unscaled(float x0, float y0, float x1, float y1, float x2, float y2, float x3, float y3) {}
   virtual void circle(double x, double y, double r);
-  virtual void ellipse_unscaled(double xt, double yt, double rx, double ry)=0;
+  virtual void ellipse_unscaled(double xt, double yt, double rx, double ry) {}
   virtual void font(Fl_Font face, Fl_Fontsize size);
-  virtual void font_unscaled(Fl_Font face, Fl_Fontsize size)=0;
+  virtual void font_unscaled(Fl_Font face, Fl_Fontsize size) {}
   virtual double width(const char *str, int n);
   virtual double width(unsigned int c);
-  virtual double width_unscaled(const char *str, int n)=0;
-  virtual double width_unscaled(unsigned int c)=0;
+  virtual double width_unscaled(const char *str, int n) { return 0.0; }
+  virtual double width_unscaled(unsigned int c) { return 0.0; }
   virtual Fl_Fontsize size();
-  virtual Fl_Fontsize size_unscaled()=0;
+  virtual Fl_Fontsize size_unscaled() { return 0; }
   virtual void text_extents(const char *str, int n, int &dx, int &dy, int &w, int &h);
-  virtual void text_extents_unscaled(const char *str, int n, int &dx, int &dy, int &w, int &h)=0;
+  virtual void text_extents_unscaled(const char *str, int n, int &dx, int &dy, int &w, int &h) {}
   virtual int height();
   virtual int descent();
-  virtual int height_unscaled()=0;
-  virtual int descent_unscaled()=0;
+  virtual int height_unscaled() { return 0; }
+  virtual int descent_unscaled() { return 0; }
   virtual void draw(const char *str, int n, int x, int y);
-  virtual void draw_unscaled(const char *str, int n, int x, int y)=0;
+  virtual void draw_unscaled(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_unscaled(int angle, const char *str, int n, int x, int y)=0;
+  virtual void draw_unscaled(int angle, 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_unscaled(const char* str, int n, int x, int y)=0;
+  virtual void rtl_draw_unscaled(const char* str, int n, int x, int y) {}
   virtual void arc(int x, int y, int w, int h, double a1, double a2);
-  virtual void arc_unscaled(float x, float y, float w, float h, double a1, double a2)=0;
+  virtual void arc_unscaled(float x, float y, float w, float h, double a1, double a2) {}
   virtual void pie(int x, int y, int w, int h, double a1, double a2);
-  virtual void pie_unscaled(float x, float y, float w, float h, double a1, double a2)=0;
+  virtual void pie_unscaled(float x, float y, float w, float h, double a1, double a2) {}
   virtual void line_style(int style, int width=0, char* dashes=0);
-  virtual void line_style_unscaled(int style, float width, char* dashes)=0;
+  virtual void line_style_unscaled(int style, float width, char* dashes) {}
   void draw_image_rescale(void *buf, Fl_Draw_Image_Cb cb, int X, int Y, int W, int H, int D, int L, bool mono, float s);
-  virtual void draw_image_unscaled(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0)=0;
-  virtual void draw_image_unscaled(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3)=0;
+  virtual void draw_image_unscaled(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0) {}
+  virtual void draw_image_unscaled(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3) {}
   void draw_image(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0);
   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_mono_unscaled(const uchar* buf, int x, int y, int w, int h, int d, int l)=0;
+  virtual void draw_image_mono_unscaled(const uchar* buf, int x, int y, int w, int h, int d, int l) {}
   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_unscaled(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1)=0;
+  virtual void draw_image_mono_unscaled(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1) {}
   void draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1);
 
   void transformed_vertex(double xf, double yf);
-  virtual void transformed_vertex0(float x, float y)=0;
+  virtual void transformed_vertex0(float x, float y) {}
   void vertex(double x, double y);
 };
 #endif // FL_DOXYGEN
diff --git a/FL/Fl_Screen_Driver.H b/FL/Fl_Screen_Driver.H
index de40ce47b..d88910b56 100644
--- a/FL/Fl_Screen_Driver.H
+++ b/FL/Fl_Screen_Driver.H
@@ -70,37 +70,37 @@ public:
   virtual void display(const char *disp);
   virtual int visual(int flags);
   // --- screen configuration
-  virtual void init() = 0;
-  virtual int x() = 0;
-  virtual int y() = 0;
-  virtual int w() = 0;
-  virtual int h() = 0;
+  virtual void init() {}
+  virtual int x() { return 0; }
+  virtual int y() { return 0; }
+  virtual int w() { return 800; } // default, override in driver!
+  virtual int h() { return 600; } // default, override in driver!
   virtual int screen_count();
   void screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my);
-  virtual void screen_xywh(int &X, int &Y, int &W, int &H, int n) = 0;
+  virtual void screen_xywh(int &X, int &Y, int &W, int &H, int n) { X=0; Y=0; W=800; H=600; }
   void screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my, int mw, int mh);
   virtual int screen_num(int x, int y);
   virtual int screen_num(int x, int y, int w, int h);
-  virtual void screen_dpi(float &h, float &v, int n=0) = 0;
+  virtual void screen_dpi(float &h, float &v, int n=0) { h=72; v=72; } // override in driver!
   void screen_work_area(int &X, int &Y, int &W, int &H, int mx, int my);
-  virtual void screen_work_area(int &X, int &Y, int &W, int &H, int n) = 0;
+  virtual void screen_work_area(int &X, int &Y, int &W, int &H, int n) { screen_xywh(X, Y, W, H, n); }
   // --- audible output
-  virtual void beep(int type) = 0;
+  virtual void beep(int type) { }
   // --- global events
-  virtual void flush() = 0;
-  virtual double wait(double time_to_wait) = 0;
-  virtual int ready() = 0;
-  virtual void grab(Fl_Window* win) = 0;
+  virtual void flush() { } // must override
+  virtual double wait(double time_to_wait) { return 0.0; } // must override
+  virtual int ready() { return 0; } // must override
+  virtual void grab(Fl_Window* win) { }
   // --- global colors
   /* the default implementation of parse_color() may be enough */
   virtual int parse_color(const char* p, uchar& r, uchar& g, uchar& b);
-  virtual void get_system_colors() = 0;
+  virtual void get_system_colors() { }
   virtual const char *get_system_scheme();
   // --- global timers
-  virtual void add_timeout(double time, Fl_Timeout_Handler cb, void *argp) = 0;
-  virtual void repeat_timeout(double time, Fl_Timeout_Handler cb, void *argp) = 0;
-  virtual int has_timeout(Fl_Timeout_Handler cb, void *argp) = 0;
-  virtual void remove_timeout(Fl_Timeout_Handler cb, void *argp) = 0;
+  virtual void add_timeout(double time, Fl_Timeout_Handler cb, void *argp) { }
+  virtual void repeat_timeout(double time, Fl_Timeout_Handler cb, void *argp) { }
+  virtual int has_timeout(Fl_Timeout_Handler cb, void *argp) { return 0; }
+  virtual void remove_timeout(Fl_Timeout_Handler cb, void *argp) { }
 
   static int secret_input_character;
   /* Implement to indicate whether complex text input may involve marked text.
diff --git a/FL/Fl_Window_Driver.H b/FL/Fl_Window_Driver.H
index c1d52ab59..09bd098f4 100644
--- a/FL/Fl_Window_Driver.H
+++ b/FL/Fl_Window_Driver.H
@@ -116,8 +116,8 @@ public:
   void resize_after_scale_change(int ns, float old_f, float new_f);
 
   // --- window data
-  virtual int decorated_w() = 0;
-  virtual int decorated_h() = 0;
+  virtual int decorated_w() { return w(); } // default, should be overidden by driver
+  virtual int decorated_h() { return h(); }
 
   // --- window management
   virtual void take_focus();