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

wxHtmlWindow::LoadFile is now available, added wxNotebookPage helper class

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-04-09 19:13:07 +00:00
parent c2a79c3e1c
commit 8245592fde
3 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wxPython/src/__version__.py
View File

@@ -1,10 +1,10 @@
# This file was generated by setup.py...
wxVERSION_STRING = '2.4.1.1p1'
wxVERSION_STRING = '2.4.1.0p1'
wxMAJOR_VERSION = 2
wxMINOR_VERSION = 4
wxRELEASE_VERSION = 1
wxSUBREL_VERSION = 1
wxSUBREL_VERSION = 0
wxVERSION = (wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_VERSION,
wxSUBREL_VERSION, 'p1')

28
wxPython/src/_extras.py
View File

@@ -774,6 +774,34 @@ class _wxPyDeadObject:
def __nonzero__(self):
return 0
#----------------------------------------------------------------------
class wxNotebookPage(wxPanel):
"""
There is an old (and apparently unsolvable) bug when placing a
window with a nonstandard background colour in a wxNotebook, as
the notbooks's background colour would always be used when the
window is refreshed. The solution is to place a panel in the
notbook and the coloured window o nthe panel, sized to cover the
panel. This simple class does that for you, just put an instance
of this in the notebook and make your regular window a child of
this one and it will handle the resize for you.
"""
def __init__(self, parent, id=-1,
pos=wxDefaultPosition, size=wxDefaultSize,
style=wxTAB_TRAVERSAL, name="panel"):
wxPanel.__init__(self, parent, id, pos, size, style, name)
self.child = None
EVT_SIZE(self, self.OnSize)
def OnSize(self, evt):
if self.child is None:
children = self.GetChildren()
if len(children):
self.child = children[0]
if self.child:
self.child.SetPosition((0,0))
self.child.SetSize(self.GetSize())
#----------------------------------------------------------------------
#----------------------------------------------------------------------

2
wxPython/src/html.i
View File

@@ -652,7 +652,7 @@ public:
bool LoadPage(const wxString& location);
// Loads HTML page from file
//TODO bool LoadFile(const wxString& filename);
bool LoadFile(const wxString& filename);
// Append to current page
bool AppendToPage(const wxString& source);