Added wx.StandardPaths.GetDocumentsDir

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

diff --git a/wxPython/demo/StandardPaths.py b/wxPython/demo/StandardPaths.py
index b1bfc6a7184352d094cdd7741ad0e7cfd4728884..6502c5c8a943aaf5f5c8b7000a7cd48b1a2abf50 100644 (file)
--- a/wxPython/demo/StandardPaths.py
+++ b/wxPython/demo/StandardPaths.py
@@ -8,14 +8,14 @@ class TestPanel(wx.Panel):
         self.log = log
         wx.Panel.__init__(self, parent, -1)
 
-        sizer = wx.FlexGridSizer(0, 3, 4, 4)
+        sizer = wx.FlexGridSizer(0, 3, 2, 2)
         box = wx.BoxSizer(wx.VERTICAL)
         fs = self.GetFont().GetPointSize()
         bf = wx.Font(fs+4, wx.SWISS, wx.NORMAL, wx.BOLD)
 
         t = wx.StaticText(self, -1, "StandardPaths")
         t.SetFont(bf)
-        box.Add(t, 0, wx.CENTER|wx.ALL, 5)
+        box.Add(t, 0, wx.CENTER|wx.ALL, 4)
         box.Add(wx.StaticLine(self, -1), 0, wx.EXPAND)
 
         # get the global (singleton) instance of wx.StandardPaths
@@ -37,7 +37,8 @@ class TestPanel(wx.Panel):
             sizer.Add(wx.StaticText(self, -1, "%s%s:" %(name, repr(args))),
                       0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
             sizer.Add(wx.TextCtrl(self, -1, func(*args),
-                                  size=(275,-1), style=wx.TE_READONLY))
+                                  size=(275,-1), style=wx.TE_READONLY),
+                      0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
 
             btn = wx.Button(self, wx.ID_HELP)
             sizer.Add(btn)
@@ -49,6 +50,7 @@ class TestPanel(wx.Panel):
                   'GetLocalDataDir',
                   'GetUserDataDir',
                   'GetUserLocalDataDir',
+                  'GetDocumentsDir',
                   'GetPluginsDir',
                   'GetInstallPrefix',
                   'GetResourcesDir',
@@ -60,7 +62,7 @@ class TestPanel(wx.Panel):
                  wx.StandardPaths.ResourceCat_Messages )
 
         self.Bind(wx.EVT_BUTTON, self.OnShowDoc, id=wx.ID_HELP)
-        box.Add(sizer, 0, wx.CENTER|wx.ALL, 20)
+        box.Add(sizer, 0, wx.CENTER|wx.ALL, 10)
         self.SetSizer(box)
 
 

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index 4a63ef4406afbc2d1544e6e3afa45af923c78715..0ab6b888482df194cb0a286eea629e313ae01edf 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -127,6 +127,8 @@ functionality that was implemented in wxWidgets, but the end result is
 cleaner for wxPython as well, and allowed me to remove some ugly code
 under the covers.
 
+Added wx.StandardPaths.GetDocumentsDir.
+
 
 
 

diff --git a/wxPython/src/_stdpaths.i b/wxPython/src/_stdpaths.i
index a190b0ebad2d7594aa8d86c7e674d01c063b8999..2b38bdd13c3c256006a876043d314c1f92f0d179 100644 (file)
--- a/wxPython/src/_stdpaths.i
+++ b/wxPython/src/_stdpaths.i
@@ -158,6 +158,13 @@ and GetResourcesDir()/lang.lproj under Mac but is something quite
 different under Unix for the message catalog category (namely the
 standard prefix/share/locale/lang/LC_MESSAGES.)", "");
     
+    DocDeclStr(
+        virtual wxString , GetDocumentsDir() const,
+        "Return the Documents directory for the current user.
+
+C:\Documents and Settings\username\Documents under Windows,
+$HOME under Unix and ~/Documents under Mac", "");
+    
        
     
     DocStr(SetInstallPrefix,