mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving simple type definitions into their own header file, so we can create a 'C' header and dont need to include the 'C++' Enumerations.H

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6312 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2008-09-19 18:49:00 +00:00
parent e8f467b9e3
commit 28dacd9509
4 changed files with 66 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
FL/Enumerations.H
View File

@ -33,6 +33,7 @@
#define Fl_Enumerations_H
# include "Fl_Export.H"
# include "fl_types.h"
/** \name Version Numbers
@ -84,30 +85,6 @@
/*@}*/ // group: Version Numbers
/** \name Miscellaneous */
/*@{*/ // group: Miscellaneous
/** unsigned char */
typedef unsigned char uchar;
/** unsigned long */
typedef unsigned long ulong;
/** Flexible length utf8 Unicode text
*
* \todo FIXME: temporary (?) typedef to mark UTF8 and Unicode conversions
*/
typedef char *Fl_String;
/** Flexible length utf8 Unicode read-only string
* \sa Fl_String
*/
typedef const char *Fl_CString;
/** 24-bit Unicode character + 8-bit indicator for keyboard flags */
typedef unsigned int Fl_Char;
/*@}*/ // group: Miscellaneous
/**
* Every time a user moves the mouse pointer, clicks a button,
* or presses a key, an event is generated and sent to your

2
FL/fl_draw.H
View File

@ -148,7 +148,7 @@ inline int fl_height(int, int size) {return size;}
FL_EXPORT int fl_descent();
FL_EXPORT double fl_width(const char*);
FL_EXPORT double fl_width(const char*, int n);
FL_EXPORT double fl_width(Fl_Char);
FL_EXPORT double fl_width(Fl_Unichar);
// draw using current font:
FL_EXPORT void fl_draw(const char*, int x, int y);

63
FL/fl_types.h Normal file
View File

@ -0,0 +1,63 @@
//
// "$Id: fl_types.h 6299 2008-09-18 19:09:34Z fabien $"
//
// Simple "C"-style types for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2008 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
// License as published by the Free Software Foundation; either
// version 2 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Library General Public License for more details.
//
// You should have received a copy of the GNU Library General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA.
//
// Please report all bugs and problems on the following page:
//
// http://www.fltk.org/str.php
//
/** \file
* This file contains simple "C"-style type definitions.
*/
#ifndef FL_TYPES_H
#define FL_TYPES_H
/** \name Miscellaneous */
/*@{*/ // group: Miscellaneous
/** unsigned char */
typedef unsigned char uchar;
/** unsigned long */
typedef unsigned long ulong;
/** Flexible length utf8 Unicode text
*
* \todo FIXME: temporary (?) typedef to mark UTF8 and Unicode conversions
*/
typedef char *Fl_String;
/** Flexible length utf8 Unicode read-only string
* \sa Fl_String
*/
typedef const char *Fl_CString;
/** 24-bit Unicode character + 8-bit indicator for keyboard flags */
typedef unsigned int Fl_Unichar;
/*@}*/ // group: Miscellaneous
#endif
//
// End of "$Id: fl_types.h 6299 2008-09-18 19:09:34Z fabien $".
//

1
FL/fl_utf8.h
View File

@ -31,6 +31,7 @@
#define _HAVE_FL_UTF8_HDR_
#include "FL/Fl_Export.H"
#include "FL/fl_types.h"
#include <stdio.h>
#include <string.h>