Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NormalizeFontSizes --> SetStandardFonts

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-09-25 03:11:22 +00:00
parent 857069f07c
commit 385721a888
4 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/demo/About.py
View File

@@ -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',) wx.Dialog.__init__(self, parent, -1, 'About the wxPython demo',)
html = wx.html.HtmlWindow(self, -1, size=(420, -1)) html = wx.html.HtmlWindow(self, -1, size=(420, -1))
if "gtk2" in wx.PlatformInfo: if "gtk2" in wx.PlatformInfo:
html.NormalizeFontSizes() html.SetStandardFonts()
py_version = sys.version.split()[0] py_version = sys.version.split()[0]
html.SetPage(self.text % (wx.VERSION_STRING, py_version)) html.SetPage(self.text % (wx.VERSION_STRING, py_version))
btn = html.FindWindowById(wx.ID_OK) btn = html.FindWindowById(wx.ID_OK)

2
wxPython/demo/HtmlWindow.py
View File

@@ -18,7 +18,7 @@ class MyHtmlWindow(html.HtmlWindow):
self.log = log self.log = log
self.Bind(wx.EVT_SCROLLWIN, self.OnScroll ) self.Bind(wx.EVT_SCROLLWIN, self.OnScroll )
if "gtk2" in wx.PlatformInfo: if "gtk2" in wx.PlatformInfo:
self.NormalizeFontSizes() self.SetStandardFonts()
def OnScroll( self, event ): def OnScroll( self, event ):
#print 'event.GetOrientation()',event.GetOrientation() #print 'event.GetOrientation()',event.GetOrientation()

2
wxPython/demo/Main.py
View File

@@ -1122,7 +1122,7 @@ class wxPythonDemo(wx.Frame):
panel.Bind(wx.EVT_ERASE_BACKGROUND, EmptyHandler) panel.Bind(wx.EVT_ERASE_BACKGROUND, EmptyHandler)
if "gtk2" in wx.PlatformInfo: if "gtk2" in wx.PlatformInfo:
self.ovr.NormalizeFontSizes() self.ovr.SetStandardFonts()
self.SetOverview(self.overviewText, mainOverview) self.SetOverview(self.overviewText, mainOverview)

36
wxPython/src/html.i
View File

@@ -199,8 +199,12 @@ public:
} }
} }
// Sets font sizes to be relative to the given size or the system default size // Sets font sizes to be relative to the given size or the system
void NormalizeFontSizes(int size=-1); // 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* GetContainer();
wxHtmlContainerCell* OpenContainer(); wxHtmlContainerCell* OpenContainer();
@@ -868,8 +872,11 @@ public:
} }
} }
// Sets font sizes to be relative to the given size or the system default size // Sets font sizes to be relative to the given size or the system
void NormalizeFontSizes(int size=-1); // default size; use either specified or default font
void SetStandardFonts(int size = -1,
const wxString& normal_face = wxPyEmptyString,
const wxString& fixed_face = wxPyEmptyString);
DocDeclStr( DocDeclStr(
void, SetTitle(const wxString& title), 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 // Sets font sizes to be relative to the given size or the system
void NormalizeFontSizes(int size=-1); // 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 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 *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 // Sets font sizes to be relative to the given size or the system
void NormalizeFontSizes(int size=-1); // 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, void SetMargins(float top = 25.2, float bottom = 25.2,
float left = 25.2, float right = 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 // Sets font sizes to be relative to the given size or the system
void NormalizeFontSizes(int size=-1); // 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;} wxPrintData *GetPrintData() {return m_PrintData;}
wxPageSetupDialogData *GetPageSetupData() {return m_PageSetupData;} wxPageSetupDialogData *GetPageSetupData() {return m_PageSetupData;}