diff options
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Widget.H | 10 | ||||
| -rw-r--r-- | FL/fl_draw.H | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H index 89d7dea12..efa2296b6 100644 --- a/FL/Fl_Widget.H +++ b/FL/Fl_Widget.H @@ -124,7 +124,7 @@ protected: \param[in] w, h size of the widget in pixels \param[in] label optional text for the widget label */ - Fl_Widget(int x, int y, int w, int h, Fl_CString label=0L); + Fl_Widget(int x, int y, int w, int h, const char *label=0L); /** Internal use only. Use position(int,int), size(int,int) or resize(int,int,int,int) instead. */ void x(int v) {x_ = v;} @@ -400,7 +400,7 @@ public: /** Gets the current label text. \return a pointer to the current label text - \see label(Fl_CString), copy_label(Fl_CString) + \see label(const char *), copy_label(const char *) */ const char* label() const {return label_.value;} @@ -426,10 +426,10 @@ public: \param[in] new_label the new label text \see label() */ - void copy_label(Fl_CString new_label); + void copy_label(const char *new_label); /** Shortcut to set the label text and type in one call. - \see label(FL_CString), labeltype(Fl_Labeltype) + \see label(const char *), labeltype(Fl_Labeltype) */ void label(Fl_Labeltype a, const char* b) {label_.type = a; label_.value = b;} @@ -842,7 +842,7 @@ public: /** Internal use only. */ int test_shortcut(); /** Internal use only. */ - static Fl_Shortcut label_shortcut(const char *t); + static unsigned int label_shortcut(const char *t); /** Internal use only. */ static int test_shortcut(const char*); diff --git a/FL/fl_draw.H b/FL/fl_draw.H index 89e09198a..68ef2878b 100644 --- a/FL/fl_draw.H +++ b/FL/fl_draw.H @@ -216,7 +216,7 @@ FL_EXPORT double fl_width(const char* txt, int n); /** Return the typographical width of a single character : \note if a valid fl_gc is NOT found then it uses the first window gc, or the screen gc if no fltk window is available when called. */ -FL_EXPORT double fl_width(Fl_Char); +FL_EXPORT double fl_width(unsigned int); /** Determine the minimum pixel dimensions of a nul-terminated string. Usage: given a string "txt" drawn using fl_draw(txt, x, y) you would determine @@ -441,8 +441,8 @@ FL_EXPORT int fl_measure_pixmap(const char* const* cdata, int &w, int &h); // other: FL_EXPORT void fl_scroll(int X, int Y, int W, int H, int dx, int dy, void (*draw_area)(void*, int,int,int,int), void* data); -FL_EXPORT const char* fl_shortcut_label(Fl_Shortcut shortcut); -FL_EXPORT const char* fl_shortcut_label(Fl_Shortcut shortcut, const char **eom); +FL_EXPORT const char* fl_shortcut_label(unsigned int shortcut); +FL_EXPORT const char* fl_shortcut_label(unsigned int shortcut, const char **eom); FL_EXPORT void fl_overlay_rect(int x,int y,int w,int h); FL_EXPORT void fl_overlay_clear(); FL_EXPORT void fl_cursor(Fl_Cursor, Fl_Color fg=FL_BLACK, Fl_Color bg=FL_WHITE); |