summaryrefslogtreecommitdiff
path: root/src/Fl_Table.cxx
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2017-08-18 15:16:08 +0000
committerAlbrecht Schlosser <albrechts.fltk@online.de>2017-08-18 15:16:08 +0000
commit2828cbde2c2a3dda5b2a4cc550dbf5f5ad12d8a5 (patch)
tree70d994a89590ca741755e2a6444bcfabb125642a /src/Fl_Table.cxx
parent638fba602018fe815321e33fa1cd26f1395b3cca (diff)
Avoid #include's of unrelated system headers in Fl_Table*.H.
Possible side effect: programs that relied upon inclusion of unrelated system headers by FL/Fl_Table.H or FL/Fl_Table_Row.H may fail to compile. Removed include files (some only on certain platforms, list may be incomplete): #include <FL/Fl.H> // moved to implementation (.cxx) #include <FL/Fl_Box.H> // moved to implementation (.cxx) #include <FL/Fl_Scrollbar.H> // moved to implementation (.cxx) #include <sys/types.h> #include <string.h> // memcpy #include <malloc.h> // WINDOWS only: malloc/realloc #include <stdlib.h> // UNIX: malloc/realloc git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12390 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Table.cxx')
-rw-r--r--src/Fl_Table.cxx39
1 files changed, 34 insertions, 5 deletions
diff --git a/src/Fl_Table.cxx b/src/Fl_Table.cxx
index a51d8d058..0dc95e135 100644
--- a/src/Fl_Table.cxx
+++ b/src/Fl_Table.cxx
@@ -17,13 +17,42 @@
// http://www.fltk.org/str.php
//
-#include <stdio.h> // fprintf
-#include <FL/fl_draw.H>
#include <FL/Fl_Table.H>
-#if defined(USE_UTF8) && ( defined(MICROSOFT) || defined(LINUX) )
-#include <FL/fl_utf8.H> // currently only Windows and Linux
-#endif
+#include <FL/Fl.H>
+#include <FL/fl_draw.H>
+
+#include <sys/types.h>
+#include <string.h> // memcpy
+#include <stdio.h> // fprintf
+
+#ifdef WIN32
+#include <malloc.h> // WINDOWS: malloc/realloc
+#else /*WIN32*/
+#include <stdlib.h> // UNIX: malloc/realloc
+#endif /*WIN32*/
+
+
+// An STL-ish vector without templates (private to Fl_Table)
+
+void Fl_Table::IntVector::copy(int *newarr, unsigned int newsize) {
+ size(newsize);
+ memcpy(arr, newarr, newsize * sizeof(int));
+}
+
+Fl_Table::IntVector::~IntVector() { // DTOR
+ if (arr)
+ free(arr);
+ arr = 0;
+}
+
+void Fl_Table::IntVector::size(unsigned int count) {
+ if (count != _size) {
+ arr = (int*)realloc(arr, count * sizeof(int));
+ _size = count;
+ }
+}
+
/** Sets the vertical scroll position so 'row' is at the top,
and causes the screen to redraw.