X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6953da00886c52a9e1d9183e1f1f27e75843cfa4..8d4ff849370781952d46cd78eb628a575ab3c688:/include/wx/html/htmldefs.h?ds=sidebyside diff --git a/include/wx/html/htmldefs.h b/include/wx/html/htmldefs.h index 26edbeee4b..469f707286 100644 --- a/include/wx/html/htmldefs.h +++ b/include/wx/html/htmldefs.h @@ -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) @@ -89,40 +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_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 - -#endif -#endif