Fix a number of mingw compile errors.

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

diff --git a/include/wx/html/htmldefs.h b/include/wx/html/htmldefs.h
index 955b4456fdb3f3986430c0f54d81724d1d404dff..4b9d54e9ec1c2c0b8de05ab14bb8790b98714f67 100644 (file)
--- a/include/wx/html/htmldefs.h
+++ b/include/wx/html/htmldefs.h
@@ -1,14 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        htmldefs.h
+// Name:        wx/html/htmldefs.h
 // Purpose:     constants for wxhtml library
 // Author:      Vaclav Slavik
+// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
-#ifndef __HTMLDEFS_H__
-#define __HTMLDEFS_H__
+#ifndef _WX_HTMLDEFS_H_
+#define _WX_HTMLDEFS_H_
 
 #include "wx/defs.h"
 
@@ -19,13 +20,14 @@
 //                  Describes alignment of text etc. in containers
 //--------------------------------------------------------------------------------
 
-#define HTML_ALIGN_LEFT            0x0000
-#define HTML_ALIGN_RIGHT           0x0002
+#define wxHTML_ALIGN_LEFT            0x0000
+#define wxHTML_ALIGN_RIGHT           0x0002
+#define wxHTML_ALIGN_JUSTIFY         0x0010
 
-#define HTML_ALIGN_TOP             0x0004
-#define HTML_ALIGN_BOTTOM          0x0008
+#define wxHTML_ALIGN_TOP             0x0004
+#define wxHTML_ALIGN_BOTTOM          0x0008
 
-#define HTML_ALIGN_CENTER          0x0001
+#define wxHTML_ALIGN_CENTER          0x0001
 
 
 
@@ -34,8 +36,8 @@
 //                  Used by wxHtmlColourCell to determine clr of what is changing
 //--------------------------------------------------------------------------------
 
-#define HTML_CLR_FOREGROUND        0x0001
-#define HTML_CLR_BACKGROUND        0x0002
+#define wxHTML_CLR_FOREGROUND        0x0001
+#define wxHTML_CLR_BACKGROUND        0x0002
 
 
 
@@ -44,8 +46,8 @@
 //                  Used to specify units
 //--------------------------------------------------------------------------------
 
-#define HTML_UNITS_PIXELS          0x0001
-#define HTML_UNITS_PERCENT         0x0002
+#define wxHTML_UNITS_PIXELS          0x0001
+#define wxHTML_UNITS_PERCENT         0x0002
 
 
 
@@ -54,14 +56,14 @@
 //                  Used to specify indetation relatives
 //--------------------------------------------------------------------------------
 
-#define HTML_INDENT_LEFT           0x0010
-#define HTML_INDENT_RIGHT          0x0020
-#define HTML_INDENT_TOP            0x0040
-#define HTML_INDENT_BOTTOM         0x0080
+#define wxHTML_INDENT_LEFT           0x0010
+#define wxHTML_INDENT_RIGHT          0x0020
+#define wxHTML_INDENT_TOP            0x0040
+#define wxHTML_INDENT_BOTTOM         0x0080
 
-#define HTML_INDENT_HORIZONTAL     HTML_INDENT_LEFT | HTML_INDENT_RIGHT
-#define HTML_INDENT_VERTICAL       HTML_INDENT_TOP | HTML_INDENT_BOTTOM
-#define HTML_INDENT_ALL            HTML_INDENT_VERTICAL | HTML_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)
 
 
 
@@ -71,14 +73,14 @@
 //                  Identifiers of wxHtmlCell's Find() conditions
 //--------------------------------------------------------------------------------
 
-#define HTML_COND_ISANCHOR              1
+#define wxHTML_COND_ISANCHOR              1
         // Finds the anchor of 'param' name (pointer to wxString).
-       
-#define HTML_COND_ISIMAGEMAP            2
+
+#define wxHTML_COND_ISIMAGEMAP            2
         // Finds imagemap of 'param' name (pointer to wxString).
-       // (used exclusively by mod_image.cpp)
+    // (used exclusively by m_image.cpp)
 
-#define HTML_COND_USER              10000
+#define wxHTML_COND_USER              10000
         // User-defined conditions should start from this number
 
 
@@ -87,12 +89,13 @@
 //                  wxHTML internal constants
 //--------------------------------------------------------------------------------
 
-#define HTML_SCROLL_STEP               16
     /* size of one scroll step of wxHtmlWindow in pixels */
-#define HTML_BUFLEN                  1024
+#define wxHTML_SCROLL_STEP               16
+
     /* size of temporary buffer used during parsing */
-#define HTML_REALLOC_STEP              32
-    /* steps of array reallocation */
+#define wxHTML_BUFLEN                  1024
+
+#endif // wxUSE_HTML
+
+#endif // _WX_HTMLDEFS_H_
 
-#endif
-#endif
\ No newline at end of file