[ 1960295 ] wxWeakRef - Reorganization and comments

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

diff --git a/include/wx/html/htmldefs.h b/include/wx/html/htmldefs.h
index f0c758d4337dfefbb67446433d7ebae8dd63a28c..469f7072860a6703f627445deb4843f6b3eb478e 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

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -61,9 +61,9 @@
 #define wxHTML_INDENT_TOP            0x0040
 #define wxHTML_INDENT_BOTTOM         0x0080
 
 #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_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
 


@@ -89,47 +89,16 @@
 //                  wxHTML internal constants
 //--------------------------------------------------------------------------------
 
 //                  wxHTML internal constants
 //--------------------------------------------------------------------------------
 

-#define wxHTML_SCROLL_STEP               16

     /* size of one scroll step of wxHtmlWindow in pixels */
     /* 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 wxHTML_SCROLL_STEP               16

 
 

-#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
+    /* size of temporary buffer used during parsing */
+#define wxHTML_BUFLEN                  1024

 
 

-#endif
+    /* maximum number of pages printable via html printing */
+#define wxHTML_PRINT_MAX_PAGES          999

 
 

+#endif // wxUSE_HTML

 
 

+#endif // _WX_HTMLDEFS_H_

 
 

-#endif
-#endif