diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2016-04-15 19:10:02 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2016-04-15 19:10:02 +0000 |
| commit | 95bf8ef443bf4880d6c82b45fd07cbb5d7fcbd66 (patch) | |
| tree | 99de49d22567663145615c323fc548fa4d35e5f8 | |
| parent | 2fcb4f419217eb2895ad0e52b15aab252eb827ef (diff) | |
Fixed Pico again.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11620 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/drivers/Pico/Fl_Pico_Graphics_Driver.H | 1 | ||||
| -rw-r--r-- | src/drivers/Pico/Fl_Pico_Graphics_Driver.cxx | 8 | ||||
| -rw-r--r-- | src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx | 8 |
3 files changed, 4 insertions, 13 deletions
diff --git a/src/drivers/Pico/Fl_Pico_Graphics_Driver.H b/src/drivers/Pico/Fl_Pico_Graphics_Driver.H index 1570c2463..7b678a8bf 100644 --- a/src/drivers/Pico/Fl_Pico_Graphics_Driver.H +++ b/src/drivers/Pico/Fl_Pico_Graphics_Driver.H @@ -163,7 +163,6 @@ class Fl_Pico_Graphics_Driver : public Fl_Graphics_Driver { // virtual Fl_Fontsize size() {return size_; } virtual double width(const char *str, int n); // virtual double width(unsigned int c) { char ch = (char)c; return width(&ch, 1); } - virtual void text_extents(const char*, int n, int& dx, int& dy, int& w, int& h); virtual int height(); virtual int descent(); // virtual Fl_Font_Descriptor *font_descriptor() { return font_descriptor_;} diff --git a/src/drivers/Pico/Fl_Pico_Graphics_Driver.cxx b/src/drivers/Pico/Fl_Pico_Graphics_Driver.cxx index 1cdeeb580..1b9be9cf9 100644 --- a/src/drivers/Pico/Fl_Pico_Graphics_Driver.cxx +++ b/src/drivers/Pico/Fl_Pico_Graphics_Driver.cxx @@ -274,14 +274,6 @@ int Fl_Pico_Graphics_Driver::height() { return (int)(size_); } -void Fl_Pico_Graphics_Driver::text_extents(const char *str, int n, int& dx, int& dy, int& w, int& h) -{ - dx = 0; - dy = descent(); - w = (int)width(str, n); - h = size_; -} - void Fl_Pico_Graphics_Driver::draw(const char *str, int n, int x, int y) { int i; diff --git a/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx index 5cfea208a..e8db6e7ce 100644 --- a/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx +++ b/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx @@ -149,16 +149,16 @@ double Fl_PicoSDL_Screen_Driver::wait(double time_to_wait) void fl_set_spot(int, int, int, int, int, int, Fl_Window*) { } void fl_reset_spot() { } -const char *fl_filename_name(char const*) { return 0; } +//const char *fl_filename_name(char const*) { return 0; } void fl_clipboard_notify_change() { } //Fl_Screen_Driver *Fl_Screen_Driver::newScreenDriver() { return 0; } //Fl_Graphics_Driver *Fl_Graphics_Driver::newMainGraphicsDriver() { return 0; } void Fl_Graphics_Driver::global_gc() { } //int Fl::dnd() { return 0; } -void Fl::copy(char const*, int, int, char const*) { } -void Fl::paste(Fl_Widget&, int, char const*) { } -void Fl::get_mouse(int&, int&) { } +//void Fl::copy(char const*, int, int, char const*) { } +//void Fl::paste(Fl_Widget&, int, char const*) { } +//void Fl::get_mouse(int&, int&) { } void Fl::set_color(Fl_Color, unsigned int) { } int Fl_X::set_cursor(Fl_Cursor) { return 0; } int Fl_X::set_cursor(Fl_RGB_Image const*, int, int) { return 0; } |
