Author: matt
Date: 2012-08-18 04:23:23 -0700 (Sat, 18 Aug 2012)
New Revision: 9676
Log:
Removed superflous semicolons. Fixed SerialPort Fltk1 reference.
Modified:
branches/branch-3.0/include/fltk3/Object.h
branches/branch-3.0/include/fltk3/Style.h
branches/branch-3.0/include/fltk3/Widget.h
branches/branch-3.0/src/fltk3/Device.cxx
branches/branch-3.0/src/fltk3/FileInput.cxx
branches/branch-3.0/src/fltk3connect/SerialPort.cxx
Modified: branches/branch-3.0/include/fltk3/Object.h
===================================================================
--- branches/branch-3.0/include/fltk3/Object.h 2012-08-18 11:02:05 UTC (rev
9675)
+++ branches/branch-3.0/include/fltk3/Object.h 2012-08-18 11:23:23 UTC (rev
9676)
@@ -77,7 +77,7 @@
void wrapper(Wrapper *w) { pWrapper = w; }
};
-}; // namespace fltk3
+} // namespace fltk3
#endif
Modified: branches/branch-3.0/include/fltk3/Style.h
===================================================================
--- branches/branch-3.0/include/fltk3/Style.h 2012-08-18 11:02:05 UTC (rev
9675)
+++ branches/branch-3.0/include/fltk3/Style.h 2012-08-18 11:23:23 UTC (rev
9676)
@@ -141,7 +141,7 @@
};
extern Style default_style;
-};
+}
#endif
Modified: branches/branch-3.0/include/fltk3/Widget.h
===================================================================
--- branches/branch-3.0/include/fltk3/Widget.h 2012-08-18 11:02:05 UTC (rev
9675)
+++ branches/branch-3.0/include/fltk3/Widget.h 2012-08-18 11:23:23 UTC (rev
9676)
@@ -292,7 +292,7 @@
enum {
INACTIVE = 1<<0, ///< the widget can't receive focus, and is
disabled but potentially visible
SHORTCUT_LABEL = 1<<6, ///< the label contains a shortcut we need to
draw
- COPIED_LABEL = 1<<10, ///< the widget label is internally copied,
its destruction is handled by the widget
+ COPIED_LABEL = 1<<10 ///< the widget label is internally copied,
its destruction is handled by the widget
};
/** Schedules the drawing of the label.
Modified: branches/branch-3.0/src/fltk3/Device.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Device.cxx 2012-08-18 11:02:05 UTC (rev
9675)
+++ branches/branch-3.0/src/fltk3/Device.cxx 2012-08-18 11:23:23 UTC (rev
9676)
@@ -60,7 +60,7 @@
n = 0;
o.x = o.y = 0;
optr = 0;
-};
+}
void fltk3::GraphicsDriver::text_extents(const char*t, int n, int& dx, int&
dy, int& w, int& h)
{
@@ -82,7 +82,7 @@
#endif
this->set_current();
_display = this;
-};
+}
//
// End of "$Id$".
Modified: branches/branch-3.0/src/fltk3/FileInput.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/FileInput.cxx 2012-08-18 11:02:05 UTC (rev
9675)
+++ branches/branch-3.0/src/fltk3/FileInput.cxx 2012-08-18 11:23:23 UTC (rev
9676)
@@ -48,7 +48,7 @@
namespace fltk3 {
const unsigned int DAMAGE_BAR = 0x10;
-};
+}
/**
Modified: branches/branch-3.0/src/fltk3connect/SerialPort.cxx
===================================================================
--- branches/branch-3.0/src/fltk3connect/SerialPort.cxx 2012-08-18 11:02:05 UTC
(rev 9675)
+++ branches/branch-3.0/src/fltk3connect/SerialPort.cxx 2012-08-18 11:23:23 UTC
(rev 9676)
@@ -366,7 +366,7 @@
ResetEvent(event_);
if (nc) {
rxActive_ = 1;
- Fl::awake(on_read_cb, this);
+ fltk3::awake(on_read_cb, this);
}
}
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
