summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGreg Ercolano <erco@seriss.com>2013-09-24 19:58:24 +0000
committerGreg Ercolano <erco@seriss.com>2013-09-24 19:58:24 +0000
commit15367447cdf95a3195ca13c385e444b8f2c76074 (patch)
tree08a3dc729c75d58e9ad3f4a704ba6c6c411057b7 /src
parent99f2010dcedda147d2a01117527f9d8aad02ab22 (diff)
Fix some warnings for IRIX 6.5
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9992 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Gl_Window.cxx2
-rw-r--r--src/Fl_Table.cxx8
-rw-r--r--src/Fl_Tabs.cxx1
3 files changed, 5 insertions, 6 deletions
diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx
index 58384a508..92b7672ed 100644
--- a/src/Fl_Gl_Window.cxx
+++ b/src/Fl_Gl_Window.cxx
@@ -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__
diff --git a/src/Fl_Table.cxx b/src/Fl_Table.cxx
index 6b4480948..10b8d1170 100644
--- a/src/Fl_Table.cxx
+++ b/src/Fl_Table.cxx
@@ -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) {
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);
diff --git a/src/Fl_Tabs.cxx b/src/Fl_Tabs.cxx
index dc080d5d4..58249f0a4 100644
--- a/src/Fl_Tabs.cxx
+++ b/src/Fl_Tabs.cxx
@@ -326,7 +326,6 @@ int Fl_Tabs::handle(int event) {
}
}
return 1;
- break;
}
return Fl_Group::handle(event);
case FL_SHORTCUT: