X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd9f7fea29e3f8bb61861f52984b7943512346ac..3bcdbe527fde583072eefab67de8974c0e17a1e2:/wxPython/src/_vscroll.i?ds=sidebyside

diff --git a/wxPython/src/_vscroll.i b/wxPython/src/_vscroll.i
index ac2dcd8b5f..fdbf1cf3c7 100644
--- a/wxPython/src/_vscroll.i
+++ b/wxPython/src/_vscroll.i
@@ -128,8 +128,8 @@ IMP_PYCALLBACK_COORD_const          (wxPyVScrolledWindow, wxVScrolledWindow, Est
 %name(VScrolledWindow) class wxPyVScrolledWindow : public wxPanel
 {
 public:
-    %addtofunc wxPyVScrolledWindow         "self._setOORInfo(self); self._setCallbackInfo(self, VScrolledWindow)"
-    %addtofunc wxPyVScrolledWindow()       ""
+    %pythonAppend wxPyVScrolledWindow         "self._setOORInfo(self); self._setCallbackInfo(self, VScrolledWindow)"
+    %pythonAppend wxPyVScrolledWindow()       ""
     
 
     wxPyVScrolledWindow(wxWindow *parent,
@@ -201,9 +201,10 @@ public:
 
 %{
 #include <wx/vlbox.h>
-DECLARE_DEF_STRING(VListBoxNameStr);
 %}
 
+MAKE_CONST_WXSTRING(VListBoxNameStr);
+
 
 // First, the C++ version
 %{
@@ -284,8 +285,8 @@ IMP_PYCALLBACK__DCRECTSIZET_const    (wxPyVListBox, wxVListBox, OnDrawBackground
 %name(VListBox) class wxPyVListBox : public wxPyVScrolledWindow
 {
 public:
-    %addtofunc wxPyVListBox         "self._setOORInfo(self);self._setCallbackInfo(self, VListBox)"
-    %addtofunc wxPyVListBox()       ""
+    %pythonAppend wxPyVListBox         "self._setOORInfo(self);self._setCallbackInfo(self, VListBox)"
+    %pythonAppend wxPyVListBox()       ""
     
 
     wxPyVListBox(wxWindow *parent,
@@ -480,8 +481,8 @@ IMP_PYCALLBACK_STRING_SIZET     (wxPyHtmlListBox, wxHtmlListBox, OnGetItemMarkup
 %name(HtmlListBox) class wxPyHtmlListBox : public wxPyVListBox
 {
 public:
-    %addtofunc wxPyHtmlListBox         "self._setOORInfo(self);self._setCallbackInfo(self, HtmlListBox)"
-    %addtofunc wxPyHtmlListBox()       ""
+    %pythonAppend wxPyHtmlListBox         "self._setOORInfo(self);self._setCallbackInfo(self, HtmlListBox)"
+    %pythonAppend wxPyHtmlListBox()       ""
     
 
     // normal constructor which calls Create() internally
@@ -507,6 +508,9 @@ public:
     void RefreshAll();
     void SetItemCount(size_t count);
 
+    // retrieve the file system used by the wxHtmlWinParser: if you use
+    // relative paths in your HTML, you should use its ChangePathTo() method
+    wxFileSystem& GetFileSystem();
 };