Author: greg.ercolano
Date: 2010-10-28 19:53:37 -0700 (Thu, 28 Oct 2010)
New Revision: 7769
Log:
Fixed strange indents, added implied break, notreached clarification.
Modified:
branches/branch-1.3/src/Fl_Input.cxx
Modified: branches/branch-1.3/src/Fl_Input.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Input.cxx 2010-10-28 23:08:06 UTC (rev
7768)
+++ branches/branch-1.3/src/Fl_Input.cxx 2010-10-29 02:53:37 UTC (rev
7769)
@@ -475,6 +475,7 @@
// insert a few selected control characters literally:
if (input_type() != FL_FLOAT_INPUT && input_type() != FL_INT_INPUT)
return replace(position(), mark(), &ascii, 1);
+ break;
}
return 0;
@@ -521,23 +522,23 @@
window()->cursor(FL_CURSOR_NONE);
return handle_key();
}
+ //NOTREACHED
case FL_PUSH:
if (Fl::dnd_text_ops()) {
int oldpos = position(), oldmark = mark();
Fl_Boxtype b = box();
- Fl_Input_::handle_mouse(
- x()+Fl::box_dx(b), y()+Fl::box_dy(b),
+ Fl_Input_::handle_mouse(x()+Fl::box_dx(b), y()+Fl::box_dy(b),
w()-Fl::box_dw(b), h()-Fl::box_dh(b), 0);
newpos = position();
position( oldpos, oldmark );
if (Fl::focus()==this && !Fl::event_state(FL_SHIFT) &&
input_type()!=FL_SECRET_INPUT &&
- ( (newpos >= mark() && newpos < position())
- || (newpos >= position() && newpos < mark())) ) {
- // user clicked in the selection, may be trying to drag
- drag_start = newpos;
- return 1;
- }
+ ( (newpos >= mark() && newpos < position()) ||
+ (newpos >= position() && newpos < mark()) ) ) {
+ // user clicked in the selection, may be trying to drag
+ drag_start = newpos;
+ return 1;
+ }
drag_start = -1;
}
@@ -602,12 +603,11 @@
return 0;
}
#endif
- {
- Fl_Boxtype b = box();
- Fl_Input_::handle_mouse(
- x()+Fl::box_dx(b), y()+Fl::box_dy(b),
- w()-Fl::box_dw(b), h()-Fl::box_dh(b), 0);
- }
+ {
+ Fl_Boxtype b = box();
+ Fl_Input_::handle_mouse(x()+Fl::box_dx(b), y()+Fl::box_dy(b),
+ w()-Fl::box_dw(b), h()-Fl::box_dh(b), 0);
+ }
return 1;
case FL_DND_LEAVE:
@@ -636,7 +636,6 @@
}
return 1;
*/
-
}
Fl_Boxtype b = box();
return Fl_Input_::handletext(event,
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit