sync with CVS updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2006-09-11 16:54:57 +00:00
parent 428f4657b6
commit 6517912d80
5 changed files with 49 additions and 7 deletions

View File

@ -230,6 +230,10 @@ toolbars that are not children of the frame, managed by sizers or
what-not will still use the emulated toolbar because of platform
restrictions in how/where the toolbar can be used.
Added wx.Window.IsVisible.

View File

@ -19,14 +19,17 @@ MAKE_CONST_WXSTRING(HyperlinkCtrlNameStr);
enum {
wxHL_CONTEXTMENU,
wxHL_DEFAULT_STYLE
wxHL_ALIGN_LEFT,
wxHL_ALIGN_RIGHT,
wxHL_ALIGN_CENTRE,
wxHL_DEFAULT_STYLE,
};
//---------------------------------------------------------------------------
%newgroup
MustHaveApp(wxHyperlinkCtrl);
MustHaveApp(wxHyperlinkCtrl);
DocStr( wxHyperlinkCtrl,
"A static text control that emulates a hyperlink. The link is displayed
@ -45,7 +48,7 @@ public:
%pythonAppend wxHyperlinkCtrl "self._setOORInfo(self)"
%pythonAppend wxHyperlinkCtrl() ""
// Constructor.
wxHyperlinkCtrl(wxWindow *parent,
wxWindowID id,

View File

@ -426,6 +426,9 @@ public:
// Returns 'True' if it was successfully loaded
bool AddCatalog(const wxString& szDomain);
// check if the given locale is provided by OS and C run time
static bool IsAvailable(int lang);
// check if the given catalog is loaded
bool IsLoaded(const wxString& szDomain) const;

View File

@ -770,6 +770,12 @@ window had already been in the specified state.", "");
bool , IsEnabled() const,
"Returns true if the window is enabled for input, false otherwise.", "");
DocDeclStr(
virtual bool , IsVisible() const,
"Returns ``True`` if the window is physically visible on the screen,
i.e. it is shown and all its parents up to the toplevel window are
shown as well.", "");

View File

@ -100,6 +100,16 @@ public:
wxString GetName() const;
wxString GetContent() const;
bool IsWhitespaceOnly() const;
int GetDepth(wxXmlNode *grandparent = NULL) const;
// Gets node content from wxXML_ENTITY_NODE
// The problem is, <tag>content<tag> is represented as
// wxXML_ENTITY_NODE name="tag", content=""
// |-- wxXML_TEXT_NODE or
// wxXML_CDATA_SECTION_NODE name="" content="content"
wxString GetNodeContent() const;
wxXmlNode *GetParent() const;
wxXmlNode *GetNext() const;
wxXmlNode *GetChildren() const;
@ -122,6 +132,20 @@ public:
// special indentation value for wxXmlDocument::Save
enum {
wxXML_NO_INDENTATION
};
// flags for wxXmlDocument::Load
enum wxXmlDocumentLoadFlag
{
wxXMLDOC_NONE = 0,
wxXMLDOC_KEEP_WHITESPACE_NODES = 1
};
// This class holds XML data/document as parsed by XML parser.
class wxXmlDocument : public wxObject
{
@ -138,13 +162,15 @@ public:
// Parses .xml file and loads data. Returns True on success, False
// otherwise.
bool Load(const wxString& filename,
const wxString& encoding = wxPyUTF8String);
const wxString& encoding = wxPyUTF8String,
int flags = wxXMLDOC_NONE);
%Rename(LoadFromStream, bool, Load(wxInputStream& stream,
const wxString& encoding = wxPyUTF8String));
const wxString& encoding = wxPyUTF8String,
int flags = wxXMLDOC_NONE));
// Saves document as .xml file.
bool Save(const wxString& filename) const;
%Rename(SaveToStream, bool, Save(wxOutputStream& stream) const);
bool Save(const wxString& filename, int indentstep=1) const;
%Rename(SaveToStream, bool, Save(wxOutputStream& stream, int indentstep=1) const);
bool IsOk() const;