summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGreg Ercolano <erco@seriss.com>2010-12-05 01:22:53 +0000
committerGreg Ercolano <erco@seriss.com>2010-12-05 01:22:53 +0000
commit770c2c2eaf345b6faa8b9ae0fcab48d0ca0a3639 (patch)
treeb1a2a02e82495a05a8d0d12e04c8ad7e02ad4c03 /src
parent0abd2665f5d4773c5e65e2dedbb1c8bbe35d4379 (diff)
CMP mods: bracing, doxygen fixes for code examples and #if DOXYGEN -> #if FL_DOXYGEN.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7950 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Table.cxx7
-rw-r--r--src/Fl_Table_Row.cxx21
2 files changed, 10 insertions, 18 deletions
diff --git a/src/Fl_Table.cxx b/src/Fl_Table.cxx
index 96fb838dc..6b73879ce 100644
--- a/src/Fl_Table.cxx
+++ b/src/Fl_Table.cxx
@@ -424,14 +424,13 @@ void Fl_Table::_auto_drag_cb() {
if (lx > x() + w() - 20) {
Fl::e_x = x() + w() - 20;
if (hscrollbar->visible())
- ((Fl_Slider*)hscrollbar)->value(
- hscrollbar->clamp(hscrollbar->value() + 30));
+ ((Fl_Slider*)hscrollbar)->value(hscrollbar->clamp(hscrollbar->value() + 30));
hscrollbar->do_callback();
_dragging_x = Fl::e_x - 30;
}
else if (lx < (x() + row_header_width())) {
Fl::e_x = x() + row_header_width() + 1;
- if (hscrollbar->visible()) {
+ if (hscrollbar->visible()) {
((Fl_Slider*)hscrollbar)->value(hscrollbar->clamp(hscrollbar->value() - 30));
}
hscrollbar->do_callback();
@@ -514,7 +513,7 @@ void Fl_Table::table_scrolled() {
if ( y > voff ) { y -= row_height(row); break; }
}
_row_position = toprow = ( row >= _rows ) ? (row - 1) : row;
- toprow_scrollpos = y; // OPTIMIZATION: save for later use
+ toprow_scrollpos = y; // OPTIMIZATION: save for later use
// Find bottom row
voff = vscrollbar->value() + tih;
for ( ; row < _rows; row++ ) {
diff --git a/src/Fl_Table_Row.cxx b/src/Fl_Table_Row.cxx
index 1acb7e3fd..d8624251c 100644
--- a/src/Fl_Table_Row.cxx
+++ b/src/Fl_Table_Row.cxx
@@ -45,16 +45,14 @@ int Fl_Table_Row::row_selected(int row) {
void Fl_Table_Row::type(TableRowSelectMode val) {
_selectmode = val;
switch ( _selectmode ) {
- case SELECT_NONE:
- {
+ case SELECT_NONE: {
for ( int row=0; row<rows(); row++ ) {
_rowselect[row] = 0;
}
redraw();
break;
}
- case SELECT_SINGLE:
- {
+ case SELECT_SINGLE: {
int count = 0;
for ( int row=0; row<rows(); row++ ) {
if ( _rowselect[row] ) {
@@ -90,8 +88,7 @@ int Fl_Table_Row::select_row(int row, int flag) {
case SELECT_NONE:
return(-1);
- case SELECT_SINGLE:
- {
+ case SELECT_SINGLE: {
int oldval;
for ( int t=0; t<rows(); t++ ) {
if ( t == row ) {
@@ -111,8 +108,7 @@ int Fl_Table_Row::select_row(int row, int flag) {
break;
}
- case SELECT_MULTI:
- {
+ case SELECT_MULTI: {
int oldval = _rowselect[row];
if ( flag == 2 ) { _rowselect[row] ^= 1; }
else { _rowselect[row] = flag; }
@@ -138,8 +134,7 @@ void Fl_Table_Row::select_all_rows(int flag) {
if ( flag != 0 ) return;
//FALLTHROUGH
- case SELECT_MULTI:
- {
+ case SELECT_MULTI: {
char changed = 0;
if ( flag == 2 ) {
for ( int row=0; row<(int)_rowselect.size(); row++ ) {
@@ -204,8 +199,7 @@ int Fl_Table_Row::handle(int event) {
select_row(R, 2); // toggle
break;
- case FL_SHIFT:
- {
+ case FL_SHIFT: {
select_row(R, 1);
if ( _last_row > -1 ) {
int srow = R, erow = _last_row;
@@ -234,8 +228,7 @@ int Fl_Table_Row::handle(int event) {
}
break;
- case FL_DRAG:
- {
+ case FL_DRAG: {
if ( _dragging_select ) {
// Dragged off table edges? Handle scrolling
int offtop = toy - _last_y; // >0 if off top of table