X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/efba2b89f15ba8757a722fc56c67f434cf960482..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/html/htmldefs.h diff --git a/include/wx/html/htmldefs.h b/include/wx/html/htmldefs.h index 20d945171a..28e30779fa 100644 --- a/include/wx/html/htmldefs.h +++ b/include/wx/html/htmldefs.h @@ -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 @@ -74,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) - + // (used exclusively by m_image.cpp) + #define wxHTML_COND_USER 10000 // User-defined conditions should start from this number @@ -98,10 +99,32 @@ /* maximum number of pages printable via html printing */ - - - - + /* 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