Added autoconf makefiles for FoldBar extended samples

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

diff --git a/wxPython/src/_vscroll.i b/wxPython/src/_vscroll.i
index ac2dcd8b5fb59713de2611cd0592310832d15807..ff24d30bd3912ca9a1eaccc2ce6755bf465353d3 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
 
     // 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
     { return wxVScrolledWindow::FindFirstFromBottom(lineLast, fullyVisible); }
 
     // get the total height of the lines between lineMin (inclusive) and


@@ -125,11 +125,14 @@ IMP_PYCALLBACK_COORD_const          (wxPyVScrolledWindow, wxVScrolledWindow, Est
    of the window and not its entire client area.
  */
 
    of the window and not its entire client area.
  */
 

-%name(VScrolledWindow) class wxPyVScrolledWindow : public wxPanel
+MustHaveApp(wxPyVScrolledWindow);
+
+%rename(VScrolledWindow) wxPyVScrolledWindow;
+class wxPyVScrolledWindow : public wxPanel

 {
 public:
 {
 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,
     
 
     wxPyVScrolledWindow(wxWindow *parent,


@@ -139,7 +142,7 @@ public:
                         long style = 0,
                         const wxString& name = wxPyPanelNameStr);
 
                         long style = 0,
                         const wxString& name = wxPyPanelNameStr);
 

-    %name(PreVScrolledWindow)wxPyVScrolledWindow();
+    %RenameCtor(PreVScrolledWindow, wxPyVScrolledWindow());

 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 


@@ -174,7 +177,7 @@ public:
 
     // return the item at the specified (in physical coordinates) position or
     // wxNOT_FOUND if none, i.e. if it is below the last item
 
     // return the item at the specified (in physical coordinates) position or
     // wxNOT_FOUND if none, i.e. if it is below the last item

-    %name(HitTestXT) int HitTest(wxCoord x, wxCoord y) const;
+    %Rename(HitTestXY, int, HitTest(wxCoord x, wxCoord y) const);

     int HitTest(const wxPoint& pt) const;
 
     // recalculate all our parameters and redisplay all lines
     int HitTest(const wxPoint& pt) const;
 
     // recalculate all our parameters and redisplay all lines


@@ -201,9 +204,10 @@ public:
 
 %{
 #include <wx/vlbox.h>
 
 %{
 #include <wx/vlbox.h>

-DECLARE_DEF_STRING(VListBoxNameStr);

 %}
 
 %}
 

+MAKE_CONST_WXSTRING(VListBoxNameStr);
+

 
 // First, the C++ version
 %{
 
 // First, the C++ version
 %{


@@ -281,11 +285,14 @@ IMP_PYCALLBACK__DCRECTSIZET_const    (wxPyVListBox, wxVListBox, OnDrawBackground
     It emits the same events as wxListBox and the same event macros may be used
     with it.
  */
     It emits the same events as wxListBox and the same event macros may be used
     with it.
  */

-%name(VListBox) class wxPyVListBox : public wxPyVScrolledWindow
+MustHaveApp(wxPyVListBox);
+
+%rename(VListBox) wxPyVListBox;
+class wxPyVListBox : public wxPyVScrolledWindow

 {
 public:
 {
 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,
     
 
     wxPyVListBox(wxWindow *parent,


@@ -295,7 +302,7 @@ public:
                  long style = 0,
                  const wxString& name = wxPyVListBoxNameStr);
 
                  long style = 0,
                  const wxString& name = wxPyVListBoxNameStr);
 

-    %name(PreVListBox) wxPyVListBox();
+    %RenameCtor(PreVListBox,  wxPyVListBox());

 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 


@@ -328,22 +335,44 @@ public:
     // this method is valid for both single and multi selection listboxes
     size_t GetSelectedCount() const;
 
     // this method is valid for both single and multi selection listboxes
     size_t GetSelectedCount() const;
 

-    // get the first selected item, returns wxNOT_FOUND if none
-    //
-    // cookie is an opaque parameter which should be passed to
-    // GetNextSelected() later
-    //
-    // this method is only valid for the multi selection listboxes
-    int GetFirstSelected(unsigned long& cookie) const;
-
-    // get next selection item, return wxNOT_FOUND if no more
-    //
-    // cookie must be the same parameter that was passed to GetFirstSelected()
-    // before
-    //
-    // this method is only valid for the multi selection listboxes
-    int GetNextSelected(unsigned long& cookie) const;
+    %extend {
+        // get the first selected item, returns wxNOT_FOUND if none
+        //
+        // cookie is an opaque parameter which should be passed to
+        // GetNextSelected() later
+        //
+        // this method is only valid for the multi selection listboxes
+        //int GetFirstSelected(unsigned long& cookie) const;
+        PyObject* GetFirstSelected() {
+            unsigned long cookie = 0;
+            int selected = self->GetFirstSelected(cookie);
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
+            PyObject* tup = PyTuple_New(2);
+            PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(selected));
+            PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(cookie));
+            wxPyEndBlockThreads(blocked);
+            return tup;           
+        }   
+
+        // get next selection item, return wxNOT_FOUND if no more
+        //
+        // cookie must be the same parameter that was passed to GetFirstSelected()
+        // before
+        //
+        // this method is only valid for the multi selection listboxes
+        // int GetNextSelected(unsigned long& cookie) const;
+        PyObject* GetNextSelected(unsigned long cookie) {
+            int selected = self->GetNextSelected(cookie);
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
+            PyObject* tup = PyTuple_New(2);
+            PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(selected));
+            PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(cookie));
+            wxPyEndBlockThreads(blocked);
+            return tup;           
+        }   
+    }

 
 

+    

     // get the margins around each item
     wxPoint GetMargins() const;
 
     // get the margins around each item
     wxPoint GetMargins() const;
 


@@ -372,7 +401,7 @@ public:
     // otherwise
     //
     // this function is only valid for the multiple selection listboxes
     // 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
 
     // selects the items in the specified range whose end points may be given
     // in any order


@@ -404,7 +433,7 @@ public:
     //
     // by default both margins are 0
     void SetMargins(const wxPoint& pt);
     //
     // by default both margins are 0
     void SetMargins(const wxPoint& pt);

-    %name(SetMarginsXY) void SetMargins(wxCoord x, wxCoord y);
+    %Rename(SetMarginsXY, void, SetMargins(wxCoord x, wxCoord y));

 
     // change the background colour of the selected cells
     void SetSelectionBackground(const wxColour& col);
 
     // change the background colour of the selected cells
     void SetSelectionBackground(const wxColour& col);


@@ -477,11 +506,13 @@ IMP_PYCALLBACK_STRING_SIZET     (wxPyHtmlListBox, wxHtmlListBox, OnGetItemMarkup
 
 
 // wxHtmlListBox is a listbox whose items are wxHtmlCells
 
 
 // wxHtmlListBox is a listbox whose items are wxHtmlCells

-%name(HtmlListBox) class wxPyHtmlListBox : public wxPyVListBox
+MustHaveApp(wxPyHtmlListBox);
+%rename(HtmlListBox) wxPyHtmlListBox;
+class wxPyHtmlListBox : public wxPyVListBox

 {
 public:
 {
 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
     
 
     // normal constructor which calls Create() internally


@@ -492,7 +523,7 @@ public:
                     long style = 0,
                     const wxString& name = wxPyVListBoxNameStr);
 
                     long style = 0,
                     const wxString& name = wxPyVListBoxNameStr);
 

-    %name(PreHtmlListBox) wxPyHtmlListBox();
+    %RenameCtor(PreHtmlListBox,  wxPyHtmlListBox());

 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 


@@ -507,6 +538,9 @@ public:
     void RefreshAll();
     void SetItemCount(size_t count);
 
     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();

 };
 
 
 };