NormalizeFontSizes --> SetStandardFonts

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

diff --git a/wxPython/demo/About.py b/wxPython/demo/About.py
index 10460ace1977a401ed26ae34047e6691b7667ab4..badc45fcaab65cd132ee1e71614ccf017e615cc9 100644 (file)
--- a/wxPython/demo/About.py
+++ b/wxPython/demo/About.py
@@ -47,7 +47,7 @@ demo item so you can learn how to use the classes yourself.</p>
         wx.Dialog.__init__(self, parent, -1, 'About the wxPython demo',)
         html = wx.html.HtmlWindow(self, -1, size=(420, -1))
         if "gtk2" in wx.PlatformInfo:
         wx.Dialog.__init__(self, parent, -1, 'About the wxPython demo',)
         html = wx.html.HtmlWindow(self, -1, size=(420, -1))
         if "gtk2" in wx.PlatformInfo:

-            html.NormalizeFontSizes()
+            html.SetStandardFonts()

         py_version = sys.version.split()[0]
         html.SetPage(self.text % (wx.VERSION_STRING, py_version))
         btn = html.FindWindowById(wx.ID_OK)
         py_version = sys.version.split()[0]
         html.SetPage(self.text % (wx.VERSION_STRING, py_version))
         btn = html.FindWindowById(wx.ID_OK)

diff --git a/wxPython/demo/HtmlWindow.py b/wxPython/demo/HtmlWindow.py
index 633a9ccb59d7401dee64594855f6404c312e3e77..0374604f14ef3cc2c9b58189937e4ce8a9651703 100644 (file)
--- a/wxPython/demo/HtmlWindow.py
+++ b/wxPython/demo/HtmlWindow.py
@@ -18,7 +18,7 @@ class MyHtmlWindow(html.HtmlWindow):
         self.log = log
         self.Bind(wx.EVT_SCROLLWIN, self.OnScroll )
         if "gtk2" in wx.PlatformInfo:
         self.log = log
         self.Bind(wx.EVT_SCROLLWIN, self.OnScroll )
         if "gtk2" in wx.PlatformInfo:

-            self.NormalizeFontSizes()
+            self.SetStandardFonts()

 
     def OnScroll( self, event ):
         #print 'event.GetOrientation()',event.GetOrientation()
 
     def OnScroll( self, event ):
         #print 'event.GetOrientation()',event.GetOrientation()

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index eed065bf0f517b6dd7ad893c2201f4ae3a440927..96a8c8eb2716dee5815536497e985b1f99c0bba1 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -1122,7 +1122,7 @@ class wxPythonDemo(wx.Frame):
             panel.Bind(wx.EVT_ERASE_BACKGROUND, EmptyHandler)
 
         if "gtk2" in wx.PlatformInfo:
             panel.Bind(wx.EVT_ERASE_BACKGROUND, EmptyHandler)
 
         if "gtk2" in wx.PlatformInfo:

-            self.ovr.NormalizeFontSizes()
+            self.ovr.SetStandardFonts()

         self.SetOverview(self.overviewText, mainOverview)
 
 
         self.SetOverview(self.overviewText, mainOverview)
 
 

diff --git a/wxPython/src/html.i b/wxPython/src/html.i
index fa26472ed3bd351857dd78f95e2d0b1774eec2c4..e667d46e9878a14cae9fdfb391a6da828cfee9e6 100644 (file)
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -199,8 +199,12 @@ public:
         }
     }
 
         }
     }
 

-    // Sets font sizes to be relative to the given size or the system default size
-    void NormalizeFontSizes(int size=-1);
+    // Sets font sizes to be relative to the given size or the system
+    // default size; use either specified or default font
+    void SetStandardFonts(int size = -1,
+                          const wxString& normal_face = wxPyEmptyString,
+                          const wxString& fixed_face = wxPyEmptyString);
+     

     
     wxHtmlContainerCell* GetContainer();
     wxHtmlContainerCell* OpenContainer();
     
     wxHtmlContainerCell* GetContainer();
     wxHtmlContainerCell* OpenContainer();


@@ -868,8 +872,11 @@ public:
         }
     }
 
         }
     }
 

-    // Sets font sizes to be relative to the given size or the system default size
-    void NormalizeFontSizes(int size=-1);
+    // Sets font sizes to be relative to the given size or the system
+    // default size; use either specified or default font
+    void SetStandardFonts(int size = -1,
+                          const wxString& normal_face = wxPyEmptyString,
+                          const wxString& fixed_face = wxPyEmptyString);

     
     DocDeclStr(
         void, SetTitle(const wxString& title),
     
     DocDeclStr(
         void, SetTitle(const wxString& title),


@@ -959,8 +966,11 @@ public:
         }
     }
 
         }
     }
 

-    // Sets font sizes to be relative to the given size or the system default size
-    void NormalizeFontSizes(int size=-1);
+    // Sets font sizes to be relative to the given size or the system
+    // default size; use either specified or default font
+    void SetStandardFonts(int size = -1,
+                          const wxString& normal_face = wxPyEmptyString,
+                          const wxString& fixed_face = wxPyEmptyString);

     
     int Render(int x, int y, int from = 0, int dont_render = false, int to = INT_MAX,
                //int *known_pagebreaks = NULL, int number_of_pages = 0
     
     int Render(int x, int y, int from = 0, int dont_render = false, int to = INT_MAX,
                //int *known_pagebreaks = NULL, int number_of_pages = 0


@@ -1004,8 +1014,11 @@ public:
         }
     }
 
         }
     }
 

-    // Sets font sizes to be relative to the given size or the system default size
-    void NormalizeFontSizes(int size=-1);
+    // Sets font sizes to be relative to the given size or the system
+    // default size; use either specified or default font
+    void SetStandardFonts(int size = -1,
+                          const wxString& normal_face = wxPyEmptyString,
+                          const wxString& fixed_face = wxPyEmptyString);

     
     void SetMargins(float top = 25.2, float bottom = 25.2,
                     float left = 25.2, float right = 25.2,
     
     void SetMargins(float top = 25.2, float bottom = 25.2,
                     float left = 25.2, float right = 25.2,


@@ -1047,8 +1060,11 @@ public:
         }
     }
 
         }
     }
 

-    // Sets font sizes to be relative to the given size or the system default size
-    void NormalizeFontSizes(int size=-1);
+    // Sets font sizes to be relative to the given size or the system
+    // default size; use either specified or default font
+    void SetStandardFonts(int size = -1,
+                          const wxString& normal_face = wxPyEmptyString,
+                          const wxString& fixed_face = wxPyEmptyString);

     
     wxPrintData *GetPrintData() {return m_PrintData;}
     wxPageSetupDialogData *GetPageSetupData() {return m_PageSetupData;}
     
     wxPrintData *GetPrintData() {return m_PrintData;}
     wxPageSetupDialogData *GetPageSetupData() {return m_PageSetupData;}