jconfig.h uses configures results

[wxWidgets.git] / utils / wxPython / src / controls.i

diff --git a/utils/wxPython/src/controls.i b/utils/wxPython/src/controls.i
index cb77a94f30f4939f3ea3208d7a7968491b60baa2..605a9d697c97a89bb11248c109be464040560dd6 100644 (file)
--- a/utils/wxPython/src/controls.i
+++ b/utils/wxPython/src/controls.i
@@ -16,6 +16,7 @@
 #include "helpers.h"
 #include <wx/slider.h>
 #include <wx/spinbutt.h>
 #include "helpers.h"
 #include <wx/slider.h>
 #include <wx/spinbutt.h>

+#include <wx/dynarray.h>

 
 #ifdef __WXMSW__
 #if wxUSE_OWNER_DRAWN
 
 #ifdef __WXMSW__
 #if wxUSE_OWNER_DRAWN


@@ -255,7 +256,20 @@ public:
     int FindString(const wxString& string);
     // TODO:    char* GetClientData(const int n);
     int GetSelection();
     int FindString(const wxString& string);
     // TODO:    char* GetClientData(const int n);
     int GetSelection();

-    // TODO: int GetSelections(int **selections);
+
+    // int GetSelections(int **selections);
+    %addmethods {
+      PyObject* GetSelections() {
+          wxArrayInt lst;
+          self->GetSelections(lst);
+          PyObject *tup = PyTuple_New(lst.GetCount());
+          for(int i=0; i<lst.GetCount(); i++) {
+              PyTuple_SetItem(tup, i, PyInt_FromLong(lst[i]));
+          }
+          return tup;
+      }
+    }
+

     wxString GetString(int n);
     wxString GetStringSelection();
     int Number();
     wxString GetString(int n);
     wxString GetStringSelection();
     int Number();


@@ -328,6 +342,7 @@ public:
     void SetValue(const wxString& value);
     void ShowPosition(long pos);
     void WriteText(const wxString& text);
     void SetValue(const wxString& value);
     void ShowPosition(long pos);
     void WriteText(const wxString& text);

+    void AppendText(const wxString& text);

     long XYToPosition(long x, long y);
 };
 
     long XYToPosition(long x, long y);
 };
 


@@ -384,7 +399,7 @@ public:
 
     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 
 
     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 

-    wxBitmap& GetBitmap();
+    const wxBitmap& GetBitmap();

     void SetBitmap(const wxBitmap& bitmap);
 };
 
     void SetBitmap(const wxBitmap& bitmap);
 };
 


@@ -404,19 +419,19 @@ public:
 
     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 
 
     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 

-    %name(EnableBox)void Enable(bool enable);
-    void Enable(int n, bool enable);
+    void Enable(bool enable);
+    %name(EnableItem)void Enable(int n, bool enable);

     int FindString(const wxString& string);
 #ifdef __WXMSW__
     int FindString(const wxString& string);
 #ifdef __WXMSW__

-    %name(GetBoxLabel)wxString GetLabel();
+    wxString GetLabel();

 #endif
 #endif

-    wxString GetLabel(int n);
+    %name(GetItemLabel)wxString GetLabel(int n);

     int GetSelection();
     wxString GetString(int n);
     wxString GetStringSelection();
     int Number();
     int GetSelection();
     wxString GetString(int n);
     wxString GetStringSelection();
     int Number();

-    %name(SetBoxLabel)void SetLabel(const wxString& label);
-    void SetLabel(int n, const wxString& label);
+    void SetLabel(const wxString& label);
+    %name(SetItemLabel)void SetLabel(int n, const wxString& label);

     void SetSelection(int n);
     void SetStringSelection(const wxString& string);
     void Show(bool show);
     void SetSelection(int n);
     void SetStringSelection(const wxString& string);
     void Show(bool show);


@@ -483,7 +498,23 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.12  1999/04/30 03:29:18  RD
+// wxPython 2.0b9, first phase (win32)
+// Added gobs of stuff, see wxPython/README.txt for details
+//
+// Revision 1.11.4.1  1999/03/27 23:29:14  RD
+//
+// wxPython 2.0b8
+//     Python thread support
+//     various minor additions
+//     various minor fixes
+//
+// Revision 1.11  1999/02/25 07:08:30  RD
+//
+// wxPython version 2.0b5
+//

 // Revision 1.10  1998/12/17 17:52:19  RD
 // Revision 1.10  1998/12/17 17:52:19  RD

+//

 // wxPython 0.5.2
 // Minor fixes and SWIG code generation for RR's changes.  MSW and GTK
 // versions are much closer now!
 // wxPython 0.5.2
 // Minor fixes and SWIG code generation for RR's changes.  MSW and GTK
 // versions are much closer now!