Updated layout test

[wxWidgets.git] / wxPython / src / _vscroll.i

diff --git a/wxPython/src/_vscroll.i b/wxPython/src/_vscroll.i
index 23f2542c6b8d0a97d8961191d6baa53f1f1aabbc..fdbf1cf3c777dcd70054ac47a8e579761a019042 100644 (file)
--- a/wxPython/src/_vscroll.i
+++ b/wxPython/src/_vscroll.i
@@ -87,7 +87,7 @@ public:
 
     // find the index of the line we need to show at the top of the window such
     // that the last (fully or partially) visible line is the given one
-    size_t FindFirstFromBottom(size_t lineLast, bool fullyVisible = false)
+    size_t FindFirstFromBottom(size_t lineLast, bool fullyVisible = False)
     { return wxVScrolledWindow::FindFirstFromBottom(lineLast, fullyVisible); }
 
     // get the total height of the lines between lineMin (inclusive) and
@@ -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,
@@ -159,7 +159,7 @@ public:
     // scroll to the specified line: it will become the first visible line in
     // the window
     //
-    // return true if we scrolled the window, false if nothing was done
+    // return True if we scrolled the window, False if nothing was done
     bool ScrollToLine(size_t line);
 
     // scroll by the specified number of lines/pages
@@ -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,
@@ -368,16 +369,16 @@ public:
     // selects or deselects the specified item which must be valid (i.e. not
     // equal to wxNOT_FOUND)
     //
-    // return true if the items selection status has changed or false
+    // return True if the items selection status has changed or False
     // otherwise
     //
     // this function is only valid for the multiple selection listboxes
-    bool Select(size_t item, bool select = true);
+    bool Select(size_t item, bool select = True);
 
     // selects the items in the specified range whose end points may be given
     // in any order
     //
-    // return true if any items selection status has changed, false otherwise
+    // return True if any items selection status has changed, False otherwise
     //
     // this function is only valid for the single selection listboxes
     bool SelectRange(size_t from, size_t to);
@@ -390,7 +391,7 @@ public:
     // select all items in the listbox
     //
     // the return code indicates if any items were affected by this operation
-    // (true) or if nothing has changed (false)
+    // (True) or if nothing has changed (False)
     bool SelectAll();
 
     // unselect all items in the listbox
@@ -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();
 };