sync with CVS updates

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

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index f8eba85751f52f8107237c148211620d22fb9af2..cd4001a50f39d0c955e9dfc5dbb47cd1113e9e5e 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -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.
 
 what-not will still use the emulated toolbar because of platform
 restrictions in how/where the toolbar can be used.
 

+Added wx.Window.IsVisible.
+
+
+

 
 
 
 
 
 

diff --git a/wxPython/src/_hyperlink.i b/wxPython/src/_hyperlink.i
index d84ab7ce647f13a4fbdaa73de2d4cb398c1ed226..5becff5f8d3acbb9a531deb9702f0bc998d8e3f9 100644 (file)
--- a/wxPython/src/_hyperlink.i
+++ b/wxPython/src/_hyperlink.i
@@ -19,14 +19,17 @@ MAKE_CONST_WXSTRING(HyperlinkCtrlNameStr);
 
 enum {
     wxHL_CONTEXTMENU,
 
 enum {
     wxHL_CONTEXTMENU,

-    wxHL_DEFAULT_STYLE
+    wxHL_ALIGN_LEFT,
+    wxHL_ALIGN_RIGHT,
+    wxHL_ALIGN_CENTRE,
+    wxHL_DEFAULT_STYLE,

 };
 
 //---------------------------------------------------------------------------
 %newgroup
 
 };
 
 //---------------------------------------------------------------------------
 %newgroup
 

-MustHaveApp(wxHyperlinkCtrl);

 
 

+MustHaveApp(wxHyperlinkCtrl);

 
 DocStr( wxHyperlinkCtrl,
 "A static text control that emulates a hyperlink. The link is displayed
 
 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()    ""
 
     %pythonAppend wxHyperlinkCtrl      "self._setOORInfo(self)"
     %pythonAppend wxHyperlinkCtrl()    ""
 

-    
+

     // Constructor.
     wxHyperlinkCtrl(wxWindow *parent,
                     wxWindowID id,
     // Constructor.
     wxHyperlinkCtrl(wxWindow *parent,
                     wxWindowID id,

diff --git a/wxPython/src/_intl.i b/wxPython/src/_intl.i
index 198fc8bfc2a86bc77830a7d11dfe513896699f21..913e4c684cc0ec4694ebb520539886c25603bbb9 100644 (file)
--- a/wxPython/src/_intl.i
+++ b/wxPython/src/_intl.i
@@ -426,6 +426,9 @@ public:
     // Returns 'True' if it was successfully loaded
     bool AddCatalog(const wxString& szDomain);
 
     // 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;
 
     // check if the given catalog is loaded
     bool IsLoaded(const wxString& szDomain) const;
 

diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index 10844879f65825849bc6bac6ca3b5c265d33516d..9dcc8b2d68b13eb3e2e39272d586ed82cd61838f 100644 (file)
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -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.", "");
 
         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.", "");
+    

     
 
 
     
 
 

diff --git a/wxPython/src/_xml.i b/wxPython/src/_xml.i
index a6320ee9554afceecba5262201d15b2680ffb39f..6b60b96a3ab782e1fbeda729b7bc954b46c9e36e 100644 (file)
--- a/wxPython/src/_xml.i
+++ b/wxPython/src/_xml.i
@@ -100,6 +100,16 @@ public:
     wxString GetName() const;
     wxString GetContent() const;
 
     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;
     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
 {
 // 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,
     // 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,
     %Rename(LoadFromStream, bool,  Load(wxInputStream& stream,

-                                   const wxString& encoding = wxPyUTF8String));
+                                        const wxString& encoding = wxPyUTF8String,
+                                        int flags = wxXMLDOC_NONE));

 
     // Saves document as .xml file.
 
     // 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;
 
 
     bool IsOk() const;