diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2007-05-20 00:01:06 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2007-05-20 00:01:06 +0000 |
| commit | 73d01dd659f82f2c53fd7cedcf0bbb8d47f70ab2 (patch) | |
| tree | 946d3744f22b87faf22f32cac8eed8619e53be55 /fluid | |
| parent | 9ca173a7020ca6a7daab001b71dfc6e84f149429 (diff) | |
Fix all compiler warnings from various build systems.
Fix vsnprintf() implementation to properly handle long and long long ints.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5845 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/Fl_Group_Type.cxx | 6 | ||||
| -rw-r--r-- | fluid/Fl_Type.cxx | 2 | ||||
| -rw-r--r-- | fluid/Fl_Widget_Type.cxx | 4 | ||||
| -rw-r--r-- | fluid/Fl_Window_Type.cxx | 2 | ||||
| -rw-r--r-- | fluid/align_widget.cxx | 2 | ||||
| -rw-r--r-- | fluid/function_panel.cxx | 4 | ||||
| -rw-r--r-- | fluid/function_panel.fl | 8 | ||||
| -rw-r--r-- | fluid/function_panel.h | 2 |
8 files changed, 15 insertions, 15 deletions
diff --git a/fluid/Fl_Group_Type.cxx b/fluid/Fl_Group_Type.cxx index 3e6c8e3d6..27a233476 100644 --- a/fluid/Fl_Group_Type.cxx +++ b/fluid/Fl_Group_Type.cxx @@ -230,7 +230,7 @@ void Fl_Group_Type::move_child(Fl_Type* cc, Fl_Type* before) { //////////////////////////////////////////////////////////////// // live mode support -Fl_Widget *Fl_Group_Type::enter_live_mode(int top) { +Fl_Widget *Fl_Group_Type::enter_live_mode(int) { Fl_Group *grp = new Fl_Group(o->x(), o->y(), o->w(), o->h()); live_widget = grp; if (live_widget) { @@ -245,7 +245,7 @@ Fl_Widget *Fl_Group_Type::enter_live_mode(int top) { return live_widget; } -Fl_Widget *Fl_Tabs_Type::enter_live_mode(int top) { +Fl_Widget *Fl_Tabs_Type::enter_live_mode(int) { Fl_Tabs *grp = new Fl_Tabs(o->x(), o->y(), o->w(), o->h()); live_widget = grp; if (live_widget) { @@ -278,7 +278,7 @@ void Fl_Group_Type::copy_properties() { const char scroll_type_name[] = "Fl_Scroll"; -Fl_Widget *Fl_Scroll_Type::enter_live_mode(int top) { +Fl_Widget *Fl_Scroll_Type::enter_live_mode(int) { Fl_Group *grp = new Fl_Scroll(o->x(), o->y(), o->w(), o->h()); grp->show(); live_widget = grp; diff --git a/fluid/Fl_Type.cxx b/fluid/Fl_Type.cxx index 75be910f4..6754de395 100644 --- a/fluid/Fl_Type.cxx +++ b/fluid/Fl_Type.cxx @@ -848,7 +848,7 @@ int Fl_Type::read_fdesign(const char*, const char*) {return 0;} * \return a widget pointer that the live mode initiator can 'show()' * \see leave_live_mode() */ -Fl_Widget *Fl_Type::enter_live_mode(int top) { +Fl_Widget *Fl_Type::enter_live_mode(int) { return 0L; } diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx index 087297752..68512cb54 100644 --- a/fluid/Fl_Widget_Type.cxx +++ b/fluid/Fl_Widget_Type.cxx @@ -1689,7 +1689,7 @@ void overlay_cb(Fl_Button*o,void *v) { void leave_live_mode_cb(Fl_Widget*, void*); -void live_mode_cb(Fl_Button*o,void *v) { +void live_mode_cb(Fl_Button*o,void *) { /// \todo live mode should end gracefully when the application quits /// or when the user closes the live widget static Fl_Type *live_type = 0L; @@ -2620,7 +2620,7 @@ void leave_live_mode_cb(Fl_Widget*, void*) { live_mode_cb(0, 0); } -Fl_Widget *Fl_Widget_Type::enter_live_mode(int top) { +Fl_Widget *Fl_Widget_Type::enter_live_mode(int) { live_widget = widget(o->x(), o->y(), o->w(), o->h()); if (live_widget) copy_properties(); diff --git a/fluid/Fl_Window_Type.cxx b/fluid/Fl_Window_Type.cxx index f43a14929..117d180de 100644 --- a/fluid/Fl_Window_Type.cxx +++ b/fluid/Fl_Window_Type.cxx @@ -1482,7 +1482,7 @@ void Fl_Widget_Class_Type::write_code2() { //////////////////////////////////////////////////////////////// // live mode support -Fl_Widget *Fl_Window_Type::enter_live_mode(int top) { +Fl_Widget *Fl_Window_Type::enter_live_mode(int) { Fl_Window *win = new Fl_Window(o->x(), o->y(), o->w(), o->h()); live_widget = win; if (live_widget) { diff --git a/fluid/align_widget.cxx b/fluid/align_widget.cxx index 5d44028fd..7b3d8b50f 100644 --- a/fluid/align_widget.cxx +++ b/fluid/align_widget.cxx @@ -521,7 +521,7 @@ void widget_size_cb(Fl_Widget *, long size) { } Fl_Widget *w = ((Fl_Widget_Type *)o)->o; - w->labelsize(size); + w->labelsize((uchar)size); Fl_Font f; int s = (int)size; Fl_Color c; diff --git a/fluid/function_panel.cxx b/fluid/function_panel.cxx index 78d4bb714..36cb1e716 100644 --- a/fluid/function_panel.cxx +++ b/fluid/function_panel.cxx @@ -483,7 +483,7 @@ Fl_Double_Window* make_comment_panel() { return comment_panel; } -void type_make_cb(Fl_Widget*w,void*d) { +void type_make_cb(Fl_Widget*,void*d) { undo_checkpoint(); Fl_Type *t = Fl_Type_make((char*)d); if (t) { @@ -499,7 +499,7 @@ void type_make_cb(Fl_Widget*w,void*d) { Fl_Window *widgetbin_panel=(Fl_Window *)0; Fl_Window* make_widgetbin() { - { widgetbin_panel = new Fl_Window(551, 85, "Widget Bin"); + { widgetbin_panel = new Fl_Window(550, 85, "Widget Bin"); widgetbin_panel->align(FL_ALIGN_CLIP|FL_ALIGN_INSIDE); { Fl_Group* o = new Fl_Group(3, 3, 79, 79); { Fl_Button* o = new Fl_Button(5, 5, 24, 24); diff --git a/fluid/function_panel.fl b/fluid/function_panel.fl index 772730d37..79c809a6a 100644 --- a/fluid/function_panel.fl +++ b/fluid/function_panel.fl @@ -125,7 +125,7 @@ Function {make_code_panel()} {open Function {make_codeblock_panel()} {open } { Fl_Window codeblock_panel { - label {Code Block Properties} + label {Code Block Properties} selected xywh {468 221 300 115} type Double labelsize 11 hide resizable code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} modal } { @@ -339,7 +339,7 @@ Function {make_comment_panel()} {open } } -Function {type_make_cb(Fl_Widget*w,void*d)} {open return_type void +Function {type_make_cb(Fl_Widget*,void*d)} {open return_type void } { code {undo_checkpoint(); Fl_Type *t = Fl_Type_make((char*)d); @@ -356,8 +356,8 @@ Function {type_make_cb(Fl_Widget*w,void*d)} {open return_type void Function {make_widgetbin()} {open } { Fl_Window widgetbin_panel { - label {Widget Bin} selected - xywh {411 171 551 85} type Single align 80 non_modal visible + label {Widget Bin} + xywh {411 171 550 85} type Single align 80 non_modal visible } { Fl_Group {} { xywh {3 3 79 79} diff --git a/fluid/function_panel.h b/fluid/function_panel.h index 9d7f8d996..08740183d 100644 --- a/fluid/function_panel.h +++ b/fluid/function_panel.h @@ -88,7 +88,7 @@ extern Fl_Light_Button *comment_in_header; extern Fl_Menu_Button *comment_predefined; extern Fl_Button *comment_load; Fl_Double_Window* make_comment_panel(); -void type_make_cb(Fl_Widget*w,void*d); +void type_make_cb(Fl_Widget*,void*d); #include <FL/Fl_Window.H> extern Fl_Window *widgetbin_panel; extern void type_make_cb(Fl_Button*, void*); |
