Browse Source

Fix some warnings for IRIX 6.5

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9992 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
pull/49/head
Greg Ercolano 12 years ago
parent
commit
15367447cd
  1. 4
      fluid/Fl_Type.cxx
  2. 2
      src/Fl_Gl_Window.cxx
  3. 8
      src/Fl_Table.cxx
  4. 1
      src/Fl_Tabs.cxx

4
fluid/Fl_Type.cxx

@ -237,10 +237,8 @@ int Widget_Browser::item_height(void *l) const { @@ -237,10 +237,8 @@ int Widget_Browser::item_height(void *l) const {
return textsize()*2+1;
else
return textsize()+2;
} else {
return 0;
}
return ((Fl_Type *)l)->visible ? textsize()+2 : 0;
return 0;
}
int Widget_Browser::incr_height() const {return textsize()+2;}

2
src/Fl_Gl_Window.cxx

@ -24,8 +24,6 @@ extern int fl_gl_load_plugin; @@ -24,8 +24,6 @@ extern int fl_gl_load_plugin;
extern void gl_texture_reset();
#endif
static int temp = fl_gl_load_plugin;
#include <FL/Fl.H>
#include <FL/x.H>
#ifdef __APPLE__

8
src/Fl_Table.cxx

@ -736,7 +736,9 @@ int Fl_Table::handle(int event) { @@ -736,7 +736,9 @@ int Fl_Table::handle(int event) {
int _event_x = Fl::event_x();
int _event_y = Fl::event_y();
int _event_key = Fl::event_key();
#if FLTK_ABI_VERSION >= 10303
int _event_state = Fl::event_state();
#endif
Fl_Widget *_focus = Fl::focus();
switch ( event ) {
case FL_PUSH:
@ -1029,15 +1031,15 @@ int Fl_Table::handle(int event) { @@ -1029,15 +1031,15 @@ int Fl_Table::handle(int event) {
case FL_Tab:
#if FLTK_ABI_VERSION >= 10303
if ( !tab_cell_nav() ) break; // not navigating cells? let fltk handle it (STR#2862)
#else
break; // without tab_cell_nav(), Fl_Table should default to navigating widgets, not cells
#endif
if ( _event_state & FL_SHIFT ) {
ret = move_cursor(0, -1, 0); // shift-tab -> left
} else {
ret = move_cursor(0, 1, 0); // tab -> right
}
break;
#else
break; // without tab_cell_nav(), Fl_Table should default to navigating widgets, not cells
#endif
}
if (ret && Fl::focus() != this) {
do_callback(CONTEXT_TABLE, -1, -1);

1
src/Fl_Tabs.cxx

@ -326,7 +326,6 @@ int Fl_Tabs::handle(int event) { @@ -326,7 +326,6 @@ int Fl_Tabs::handle(int event) {
}
}
return 1;
break;
}
return Fl_Group::handle(event);
case FL_SHORTCUT:

Loading…
Cancel
Save