From 5bc48808b6aed5469c3e62e1402e10c797a5d02a Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Mon, 7 Dec 2009 22:04:55 +0000 Subject: Removed typedef that simply renamed char* to Fl_String, as discussed in the mailing list. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6955 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_Widget.H | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'FL/Fl_Widget.H') 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*); -- cgit v1.2.3