Fix compiler warnings in fluid-generated code (STR #2813).

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10696 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
fltk · Apr 10, 2015 · 6b8f3c6 · 6b8f3c6
1 parent ce76b65
commit 6b8f3c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/fluid/Fl_Menu_Type.cxx b/fluid/Fl_Menu_Type.cxx
@@ -318,7 +318,7 @@ void Fl_Menu_Item_Type::write_item() {
     write_c(" (void*)(%s),", user_data());
   else
     write_c(" 0,");
-  write_c(" %d, %s, %d, %d, %d", flags(),
+  write_c(" %d, (uchar)%s, %d, %d, %d", flags(),
 	  labeltypes[o->labeltype()], o->labelfont(), o->labelsize(), o->labelcolor());
   write_c("},\n");
 }

diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx
@@ -2187,7 +2187,7 @@ void Fl_Widget_Type::write_code1() {
 
   indentation += 2;
 
-  if (wused) write_c("%sw = o;\n", indent());
+  if (wused) write_c("%sw = o; if (w) {/* empty */}\n", indent());
 
   write_widget_code();
 }