X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4eecf1150d4954e389f49c402756f2381915dd10..d0f063020e6fb1b1a660952d0844071e0df24324:/include/wx/html/htmldefs.h diff --git a/include/wx/html/htmldefs.h b/include/wx/html/htmldefs.h index 28e30779fa..469f707286 100644 --- a/include/wx/html/htmldefs.h +++ b/include/wx/html/htmldefs.h @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -61,9 +61,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) @@ -75,11 +75,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) - + #define wxHTML_COND_USER 10000 // User-defined conditions should start from this number @@ -89,69 +89,16 @@ // wxHTML internal constants //-------------------------------------------------------------------------------- -#define wxHTML_SCROLL_STEP 16 /* size of one scroll step of wxHtmlWindow in pixels */ -#define wxHTML_BUFLEN 1024 +#define wxHTML_SCROLL_STEP 16 + /* size of temporary buffer used during parsing */ -#define wxHTML_REALLOC_STEP 32 - /* steps of array reallocation */ -#define wxHTML_PRINT_MAX_PAGES 999 +#define wxHTML_BUFLEN 1024 + /* maximum number of pages printable via html printing */ +#define wxHTML_PRINT_MAX_PAGES 999 + +#endif // wxUSE_HTML +#endif // _WX_HTMLDEFS_H_ - /* default font sizes */ -#ifdef __WXMSW__ - #define wxHTML_FONT_SIZE_1 7 - #define wxHTML_FONT_SIZE_2 8 - #define wxHTML_FONT_SIZE_3 10 - #define wxHTML_FONT_SIZE_4 12 - #define wxHTML_FONT_SIZE_5 16 - #define wxHTML_FONT_SIZE_6 22 - #define wxHTML_FONT_SIZE_7 30 -#elif defined(__WXMAC__) - #define wxHTML_FONT_SIZE_1 9 - #define wxHTML_FONT_SIZE_2 12 - #define wxHTML_FONT_SIZE_3 14 - #define wxHTML_FONT_SIZE_4 18 - #define wxHTML_FONT_SIZE_5 24 - #define wxHTML_FONT_SIZE_6 30 - #define wxHTML_FONT_SIZE_7 36 -#else - #define wxHTML_FONT_SIZE_1 10 - #define wxHTML_FONT_SIZE_2 12 - #define wxHTML_FONT_SIZE_3 14 - #define wxHTML_FONT_SIZE_4 16 - #define wxHTML_FONT_SIZE_5 19 - #define wxHTML_FONT_SIZE_6 24 - #define wxHTML_FONT_SIZE_7 32 -#endif - - -#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 - -#endif - - - -#endif -#endif