X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/efba2b89f15ba8757a722fc56c67f434cf960482..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/html/htmldefs.h diff --git a/include/wx/html/htmldefs.h b/include/wx/html/htmldefs.h index 20d945171a..ec7348f85a 100644 --- a/include/wx/html/htmldefs.h +++ b/include/wx/html/htmldefs.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: htmldefs.h +// Name: wx/html/htmldefs.h // Purpose: constants for wxhtml library // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -22,6 +22,7 @@ #define wxHTML_ALIGN_LEFT 0x0000 #define wxHTML_ALIGN_RIGHT 0x0002 +#define wxHTML_ALIGN_JUSTIFY 0x0010 #define wxHTML_ALIGN_TOP 0x0004 #define wxHTML_ALIGN_BOTTOM 0x0008 @@ -35,8 +36,9 @@ // Used by wxHtmlColourCell to determine clr of what is changing //-------------------------------------------------------------------------------- -#define wxHTML_CLR_FOREGROUND 0x0001 -#define wxHTML_CLR_BACKGROUND 0x0002 +#define wxHTML_CLR_FOREGROUND 0x0001 +#define wxHTML_CLR_BACKGROUND 0x0002 +#define wxHTML_CLR_TRANSPARENT_BACKGROUND 0x0004 @@ -60,9 +62,9 @@ #define wxHTML_INDENT_TOP 0x0040 #define wxHTML_INDENT_BOTTOM 0x0080 -#define wxHTML_INDENT_HORIZONTAL wxHTML_INDENT_LEFT | wxHTML_INDENT_RIGHT -#define wxHTML_INDENT_VERTICAL wxHTML_INDENT_TOP | wxHTML_INDENT_BOTTOM -#define wxHTML_INDENT_ALL wxHTML_INDENT_VERTICAL | wxHTML_INDENT_HORIZONTAL +#define wxHTML_INDENT_HORIZONTAL (wxHTML_INDENT_LEFT | wxHTML_INDENT_RIGHT) +#define wxHTML_INDENT_VERTICAL (wxHTML_INDENT_TOP | wxHTML_INDENT_BOTTOM) +#define wxHTML_INDENT_ALL (wxHTML_INDENT_VERTICAL | wxHTML_INDENT_HORIZONTAL) @@ -74,11 +76,11 @@ #define wxHTML_COND_ISANCHOR 1 // Finds the anchor of 'param' name (pointer to wxString). - + #define wxHTML_COND_ISIMAGEMAP 2 // Finds imagemap of 'param' name (pointer to wxString). - // (used exclusively by m_image.cpp) - + // (used exclusively by m_image.cpp) + #define wxHTML_COND_USER 10000 // User-defined conditions should start from this number @@ -88,47 +90,13 @@ // wxHTML internal constants //-------------------------------------------------------------------------------- -#define wxHTML_SCROLL_STEP 16 /* size of one scroll step of wxHtmlWindow in pixels */ -#define wxHTML_BUFLEN 1024 - /* size of temporary buffer used during parsing */ -#define wxHTML_REALLOC_STEP 32 - /* steps of array reallocation */ -#define wxHTML_PRINT_MAX_PAGES 999 - /* maximum number of pages printable via html printing */ - - - - - - - - -#if WXWIN_COMPATIBILITY_2 - -#define HTML_ALIGN_LEFT wxHTML_ALIGN_LEFT -#define HTML_ALIGN_RIGHT wxHTML_ALIGN_RIGHT -#define HTML_ALIGN_TOP wxHTML_ALIGN_TOP -#define HTML_ALIGN_BOTTOM wxHTML_ALIGN_BOTTOM -#define HTML_ALIGN_CENTER wxHTML_ALIGN_CENTER -#define HTML_CLR_FOREGROUND wxHTML_CLR_FOREGROUND -#define HTML_CLR_BACKGROUND wxHTML_CLR_BACKGROUND -#define HTML_UNITS_PIXELS wxHTML_UNITS_PIXELS -#define HTML_UNITS_PERCENT wxHTML_UNITS_PERCENT -#define HTML_INDENT_LEFT wxHTML_INDENT_LEFT -#define HTML_INDENT_RIGHT wxHTML_INDENT_RIGHT -#define HTML_INDENT_TOP wxHTML_INDENT_TOP -#define HTML_INDENT_BOTTOM wxHTML_INDENT_BOTTOM -#define HTML_INDENT_HORIZONTAL wxHTML_INDENT_HORIZONTAL -#define HTML_INDENT_VERTICAL wxHTML_INDENT_VERTICAL -#define HTML_INDENT_ALL wxHTML_INDENT_ALL -#define HTML_COND_ISANCHOR wxHTML_COND_ISANCHOR -#define HTML_COND_ISIMAGEMAP wxHTML_COND_ISIMAGEMAP -#define HTML_COND_USER wxHTML_COND_USER +#define wxHTML_SCROLL_STEP 16 -#endif + /* size of temporary buffer used during parsing */ +#define wxHTML_BUFLEN 1024 +#endif // wxUSE_HTML +#endif // _WX_HTMLDEFS_H_ -#endif -#endif