Added HTML_FONT_SIZE values

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/_html_rename.i b/wxPython/src/_html_rename.i
index f6eb4bed3afec5fd61674b7398f60c6b09c320e5..b3bbfefc922e5a40f44ee03b997a467386d580a8 100644 (file)
--- a/wxPython/src/_html_rename.i
+++ b/wxPython/src/_html_rename.i
@@ -22,6 +22,13 @@
 %rename(HTML_COND_ISANCHOR)                 wxHTML_COND_ISANCHOR;
 %rename(HTML_COND_ISIMAGEMAP)               wxHTML_COND_ISIMAGEMAP;
 %rename(HTML_COND_USER)                     wxHTML_COND_USER;
+%rename(HTML_FONT_SIZE_1)                   wxHTML_FONT_SIZE_1;
+%rename(HTML_FONT_SIZE_2)                   wxHTML_FONT_SIZE_2;
+%rename(HTML_FONT_SIZE_3)                   wxHTML_FONT_SIZE_3;
+%rename(HTML_FONT_SIZE_4)                   wxHTML_FONT_SIZE_4;
+%rename(HTML_FONT_SIZE_5)                   wxHTML_FONT_SIZE_5;
+%rename(HTML_FONT_SIZE_6)                   wxHTML_FONT_SIZE_6;
+%rename(HTML_FONT_SIZE_7)                   wxHTML_FONT_SIZE_7;
 %rename(HW_SCROLLBAR_NEVER)                 wxHW_SCROLLBAR_NEVER;
 %rename(HW_SCROLLBAR_AUTO)                  wxHW_SCROLLBAR_AUTO;
 %rename(HW_NO_SELECTION)                    wxHW_NO_SELECTION;

diff --git a/wxPython/src/gtk/html.py b/wxPython/src/gtk/html.py
index 452dae04c82e59c1b896c81d3c292d1d397141e2..3f585bcc02f2d8d9d98dbec095f6c81d468d7885 100644 (file)
--- a/wxPython/src/gtk/html.py
+++ b/wxPython/src/gtk/html.py
@@ -27,6 +27,13 @@ HTML_INDENT_ALL = _html.HTML_INDENT_ALL
 HTML_COND_ISANCHOR = _html.HTML_COND_ISANCHOR
 HTML_COND_ISIMAGEMAP = _html.HTML_COND_ISIMAGEMAP
 HTML_COND_USER = _html.HTML_COND_USER
+HTML_FONT_SIZE_1 = _html.HTML_FONT_SIZE_1
+HTML_FONT_SIZE_2 = _html.HTML_FONT_SIZE_2
+HTML_FONT_SIZE_3 = _html.HTML_FONT_SIZE_3
+HTML_FONT_SIZE_4 = _html.HTML_FONT_SIZE_4
+HTML_FONT_SIZE_5 = _html.HTML_FONT_SIZE_5
+HTML_FONT_SIZE_6 = _html.HTML_FONT_SIZE_6
+HTML_FONT_SIZE_7 = _html.HTML_FONT_SIZE_7
 HW_SCROLLBAR_NEVER = _html.HW_SCROLLBAR_NEVER
 HW_SCROLLBAR_AUTO = _html.HW_SCROLLBAR_AUTO
 HW_NO_SELECTION = _html.HW_NO_SELECTION

diff --git a/wxPython/src/gtk/html_wrap.cpp b/wxPython/src/gtk/html_wrap.cpp
index cb1c29b653e060a6f9b69aa038dbe327879c848f..a2f15dc94a6f9db900d8bb83003e6294d623bc26 100644 (file)
--- a/wxPython/src/gtk/html_wrap.cpp
+++ b/wxPython/src/gtk/html_wrap.cpp
@@ -10662,6 +10662,13 @@ static swig_const_info swig_const_table[] = {
 { SWIG_PY_INT,     (char *)"HTML_COND_ISANCHOR", (long) wxHTML_COND_ISANCHOR, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"HTML_COND_ISIMAGEMAP", (long) wxHTML_COND_ISIMAGEMAP, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"HTML_COND_USER", (long) wxHTML_COND_USER, 0, 0, 0},
+{ SWIG_PY_INT,     (char *)"HTML_FONT_SIZE_1", (long) wxHTML_FONT_SIZE_1, 0, 0, 0},
+{ SWIG_PY_INT,     (char *)"HTML_FONT_SIZE_2", (long) wxHTML_FONT_SIZE_2, 0, 0, 0},
+{ SWIG_PY_INT,     (char *)"HTML_FONT_SIZE_3", (long) wxHTML_FONT_SIZE_3, 0, 0, 0},
+{ SWIG_PY_INT,     (char *)"HTML_FONT_SIZE_4", (long) wxHTML_FONT_SIZE_4, 0, 0, 0},
+{ SWIG_PY_INT,     (char *)"HTML_FONT_SIZE_5", (long) wxHTML_FONT_SIZE_5, 0, 0, 0},
+{ SWIG_PY_INT,     (char *)"HTML_FONT_SIZE_6", (long) wxHTML_FONT_SIZE_6, 0, 0, 0},
+{ SWIG_PY_INT,     (char *)"HTML_FONT_SIZE_7", (long) wxHTML_FONT_SIZE_7, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"HW_SCROLLBAR_NEVER", (long) wxHW_SCROLLBAR_NEVER, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"HW_SCROLLBAR_AUTO", (long) wxHW_SCROLLBAR_AUTO, 0, 0, 0},
 { SWIG_PY_INT,     (char *)"HW_NO_SELECTION", (long) wxHW_NO_SELECTION, 0, 0, 0},

diff --git a/wxPython/src/html.i b/wxPython/src/html.i
index ac838a8faed218502b7897bf8446fa60c4338288..86609a3fd60a42c8c7aaf41ec3a489a582013a2b 100644 (file)
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -75,6 +75,15 @@ enum {
     wxHTML_COND_ISANCHOR,
     wxHTML_COND_ISIMAGEMAP,
     wxHTML_COND_USER,
+
+
+    wxHTML_FONT_SIZE_1,
+    wxHTML_FONT_SIZE_2,
+    wxHTML_FONT_SIZE_3,
+    wxHTML_FONT_SIZE_4,
+    wxHTML_FONT_SIZE_5,
+    wxHTML_FONT_SIZE_6,
+    wxHTML_FONT_SIZE_7,
 };
 
 

diff --git a/wxPython/wxPython/html.py b/wxPython/wxPython/html.py
index f082d00db02300b5646d628c91ed2b2f76f7600a..a62f09db09651276b4dbc2b6845add401798b24d 100644 (file)
--- a/wxPython/wxPython/html.py
+++ b/wxPython/wxPython/html.py
@@ -38,6 +38,13 @@ wxHTML_INDENT_ALL = wx.html.HTML_INDENT_ALL
 wxHTML_COND_ISANCHOR = wx.html.HTML_COND_ISANCHOR
 wxHTML_COND_ISIMAGEMAP = wx.html.HTML_COND_ISIMAGEMAP
 wxHTML_COND_USER = wx.html.HTML_COND_USER
+wxHTML_FONT_SIZE_1 = wx.html.HTML_FONT_SIZE_1
+wxHTML_FONT_SIZE_2 = wx.html.HTML_FONT_SIZE_2
+wxHTML_FONT_SIZE_3 = wx.html.HTML_FONT_SIZE_3
+wxHTML_FONT_SIZE_4 = wx.html.HTML_FONT_SIZE_4
+wxHTML_FONT_SIZE_5 = wx.html.HTML_FONT_SIZE_5
+wxHTML_FONT_SIZE_6 = wx.html.HTML_FONT_SIZE_6
+wxHTML_FONT_SIZE_7 = wx.html.HTML_FONT_SIZE_7
 wxHW_SCROLLBAR_NEVER = wx.html.HW_SCROLLBAR_NEVER
 wxHW_SCROLLBAR_AUTO = wx.html.HW_SCROLLBAR_AUTO
 wxHW_NO_SELECTION = wx.html.HW_NO_SELECTION