applied heavily modified patch 1116702: support for specifying disabled toolbar image...

[wxWidgets.git] / include / wx / html / htmldefs.h

diff --git a/include/wx/html/htmldefs.h b/include/wx/html/htmldefs.h
index 20d945171a92a2af235e0b0b9c7034ca0fcc5168..26edbeee4bb4508cd75ad2633f6361379385b183 100644 (file)
--- 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
 // 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_LEFT            0x0000
 #define wxHTML_ALIGN_RIGHT           0x0002

+#define wxHTML_ALIGN_JUSTIFY         0x0010

 
 #define wxHTML_ALIGN_TOP             0x0004
 #define wxHTML_ALIGN_BOTTOM          0x0008
 
 #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_ISANCHOR              1
         // Finds the anchor of 'param' name (pointer to wxString).

-       
+

 #define wxHTML_COND_ISIMAGEMAP            2
         // Finds imagemap 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
 
 #define wxHTML_COND_USER              10000
         // User-defined conditions should start from this number
 


@@ -92,43 +93,36 @@
     /* size of one scroll step of wxHtmlWindow in pixels */
 #define wxHTML_BUFLEN                  1024
     /* size of temporary buffer used during parsing */
     /* 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 */
 
 
 #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
-
+    /* 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
 #endif
 #endif
 #endif