Update of /cvsroot/htoolkit/port/src/include
In directory sc8-pr-cvs1:/tmp/cvs-serv18393/port/src/include
Modified Files:
Canvas.h Font.h Types.h
Log Message:
The new defaultFontDef function now returns the default font which is specified
in Windows. The defaultPen function is renamed to windowPen and now the window
and dialog pens have colors whichs are given from Windows settings.
Index: Canvas.h
===================================================================
RCS file: /cvsroot/htoolkit/port/src/include/Canvas.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Canvas.h 3 Feb 2003 16:53:41 -0000 1.6
--- Canvas.h 24 Aug 2003 19:02:45 -0000 1.7
***************
*** 58,60 ****
--- 58,64 ----
extern void osGetScaleFactor(CanvasHandle canvas,int*,int*,int*,int*);
+ unsigned int osGetDialogColor();
+ unsigned int osGetWindowColor();
+ unsigned int osGetTextColor();
+
#endif
Index: Font.h
===================================================================
RCS file: /cvsroot/htoolkit/port/src/include/Font.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Font.h 22 Jan 2003 01:21:12 -0000 1.2
--- Font.h 24 Aug 2003 19:02:45 -0000 1.3
***************
*** 4,11 ****
#include "Types.h"
extern char *osGetAvailableFontNames();
extern int *osGetAvailableFontVariants(char *szFontName, int nLow, int nHigh);
! extern FontHandle osCreateFont(char *face, int size, int weight, int style, BOOL IsUnderlined, BOOL IsStriked);
extern void osDeleteFont(FontHandle font);
--- 4,22 ----
#include "Types.h"
+ // the following types are exqlusive
+ #define FONT_NORMAL 0x00
+ #define FONT_ITALIC 0x01
+ #define FONT_OBLIQUE 0x02
+
+ // types mask
+ #define FONT_TYPE_MASK 0x03
+
+ #define FONT_UNDERLINED 0x04
+ #define FONT_STRIKED 0x08
+
extern char *osGetAvailableFontNames();
extern int *osGetAvailableFontVariants(char *szFontName, int nLow, int nHigh);
! extern FontHandle osCreateFont(char *face, int size, int weight, int style);
extern void osDeleteFont(FontHandle font);
***************
*** 18,22 ****
extern int osGetFontCharWidth(char,FontHandle font,CanvasHandle canvas);
- extern void osDialogFontDef(char **face, int *size, int *weight, int *style);
extern void osDefaultFontDef(char **face, int *size, int *weight, int *style);
extern void osSerifFontDef(char **face, int *size, int *weight, int *style);
--- 29,32 ----
Index: Types.h
===================================================================
RCS file: /cvsroot/htoolkit/port/src/include/Types.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Types.h 23 Aug 2003 11:05:59 -0000 1.16
--- Types.h 24 Aug 2003 19:02:45 -0000 1.17
***************
*** 103,108 ****
PangoFontDescription *font_descr;
PangoFontMetrics *metrics;
!
! gboolean IsUnderlined, IsStriked;
} *FontHandle;
--- 103,107 ----
PangoFontDescription *font_descr;
PangoFontMetrics *metrics;
! gint style;
} *FontHandle;
|
