diff --git a/ChangeLog b/ChangeLog index 9a4c5fa9..ab9bee17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -2017-91-03 Markus Gans +2017-09-07 Markus Gans + * Type definition exported into a separate header file + +2017-09-03 Markus Gans * Fixes wrong maximum line width in FListView 2017-08-26 Markus Gans diff --git a/src/fc.h b/src/fc.h index 37881baa..f0905b2a 100644 --- a/src/fc.h +++ b/src/fc.h @@ -13,6 +13,17 @@ #include "fstring.h" +// ascii sequences +#define ESC "\033" // Escape +#define CSI ESC "[" // Control sequence introducer (7-bit) +#define ENQ "\005" // Enquiry +#define BEL "\007" // Bell (ctrl‐g) +#define BS "\010" // Backspace +#define SO "\016" // Shift out (alternative character set) +#define SI "\017" // Shift in (regular character set) +#define OSC ESC "]" // Operating system command (7-bit) +#define SECDA ESC "[>c" // Secondary Device Attributes + //---------------------------------------------------------------------- // class fc diff --git a/src/fobject.h b/src/fobject.h index b3d92195..68616745 100644 --- a/src/fobject.h +++ b/src/fobject.h @@ -20,7 +20,7 @@ #include "fc.h" #include "fevent.h" - +#include "ftypes.h" #define null NULL diff --git a/src/foptiattr.h b/src/foptiattr.h index 9c0d83f9..a4d663f7 100644 --- a/src/foptiattr.h +++ b/src/foptiattr.h @@ -16,11 +16,7 @@ #include #include // need for tparm -// ascii sequences -#define ESC "\033" // Escape -#define CSI ESC "[" // Control sequence introducer (7-bit) - -typedef unsigned char uChar; +#include "fc.h" //---------------------------------------------------------------------- diff --git a/src/fstring.h b/src/fstring.h index 338940fc..f6c0ae7c 100644 --- a/src/fstring.h +++ b/src/fstring.h @@ -11,8 +11,6 @@ #ifndef FSTRING_H #define FSTRING_H -#include - #include #include @@ -33,23 +31,7 @@ #include #include - -typedef unsigned char uChar; -typedef unsigned int uInt; -typedef unsigned long uLong; -typedef uint8_t uInt8; -typedef uint16_t uInt16; -typedef uint32_t uInt32; -typedef uint64_t uInt64; - -typedef signed int sInt; -typedef signed long sLong; -typedef int8_t sInt8; -typedef int16_t sInt16; -typedef int32_t sInt32; -typedef int64_t sInt64; - -typedef long double lDouble; +#include "ftypes.h" //---------------------------------------------------------------------- diff --git a/src/fterm.h b/src/fterm.h index 972346aa..ae60bf34 100644 --- a/src/fterm.h +++ b/src/fterm.h @@ -81,15 +81,6 @@ #undef buttons // from term.h #endif -// ascii sequences -#define ENQ "\005" // Enquiry -#define BEL "\007" // Bell (ctrl‐g) -#define BS "\010" // Backspace -#define SO "\016" // Shift out (alternative character set) -#define SI "\017" // Shift in (regular character set) -#define OSC ESC "]" // Operating system command (7-bit) -#define SECDA ESC "[>c" // Secondary Device Attributes - //---------------------------------------------------------------------- // class FTerm diff --git a/src/ftypes.h b/src/ftypes.h new file mode 100644 index 00000000..34ad0c86 --- /dev/null +++ b/src/ftypes.h @@ -0,0 +1,26 @@ +// File: ftypes.h + +#ifndef FTYPES_H +#define FTYPES_H + +#include + +typedef unsigned char uChar; +typedef unsigned int uInt; +typedef unsigned long uLong; +typedef uint8_t uInt8; +typedef uint16_t uInt16; +typedef uint32_t uInt32; +typedef uint64_t uInt64; + +typedef signed int sInt; +typedef signed long sLong; +typedef int8_t sInt8; +typedef int16_t sInt16; +typedef int32_t sInt32; +typedef int64_t sInt64; + +typedef long double lDouble; + +#endif // FTYPES_H + diff --git a/test/treeview.cpp b/test/treeview.cpp index c1e5ea31..45d3c8de 100644 --- a/test/treeview.cpp +++ b/test/treeview.cpp @@ -75,6 +75,9 @@ Treeview::Treeview (FWidget* parent) listView->insert (line); } + // Enable the tree view + listView->setTreeView(); + // Quit button FButton* Quit = new FButton (this); Quit->setGeometry(24, 16, 10, 1);