diff options
| author | Manolo Gouy <Manolo> | 2013-09-25 08:55:01 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2013-09-25 08:55:01 +0000 |
| commit | ce0e298a8afa280d659a75ed308b2da9b2e45451 (patch) | |
| tree | 584e46fdc720cce0c32833df760080550c349e53 | |
| parent | 15367447cdf95a3195ca13c385e444b8f2c76074 (diff) | |
Removed some of the warnings mentioned in [fltk.coredev] New warnings with FLTK 1.3.x svn r9991
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9993 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Fl_PostScript.H | 1 | ||||
| -rw-r--r-- | src/Fl_PostScript.cxx | 4 | ||||
| -rw-r--r-- | src/Fl_cocoa.mm | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/FL/Fl_PostScript.H b/FL/Fl_PostScript.H index 6cf8b096e..bfa588b7c 100644 --- a/FL/Fl_PostScript.H +++ b/FL/Fl_PostScript.H @@ -198,6 +198,7 @@ class Clip { void rtl_draw(const char* s, int n, int x, int y); void font(int face, int size); double width(const char *, int); + double width(unsigned int u); void text_extents(const char *c, int n, int &dx, int &dy, int &w, int &h); int height(); int descent(); diff --git a/src/Fl_PostScript.cxx b/src/Fl_PostScript.cxx index 307fdaf3b..968fe9535 100644 --- a/src/Fl_PostScript.cxx +++ b/src/Fl_PostScript.cxx @@ -964,6 +964,10 @@ double Fl_PostScript_Graphics_Driver::width(const char *s, int n) { return Fl_Display_Device::display_device()->driver()->width(s, n); } +double Fl_PostScript_Graphics_Driver::width(unsigned u) { + return Fl_Display_Device::display_device()->driver()->width(u); +} + int Fl_PostScript_Graphics_Driver::height() { return Fl_Display_Device::display_device()->driver()->height(); } diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 7ab9015e0..1a03bc135 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -2781,7 +2781,7 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) { NSData *data = [clip dataForType:found]; if (data) { NSInteger len; - char *aux_c; + char *aux_c = NULL; if (![found isEqualToString:utf8_format]) { NSString *auxstring; auxstring = (NSString *)CFStringCreateWithBytes(NULL, |