more updates

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

diff --git a/utils/wxPython/src/controls.i b/utils/wxPython/src/controls.i
index cffa62eb186855190abec7c983cac7f3e12e0e21..dbdce2edecb7d2eac435ef503cff9696045a7c9d 100644 (file)
--- a/utils/wxPython/src/controls.i
+++ b/utils/wxPython/src/controls.i
@@ -17,6 +17,7 @@
 #include <wx/slider.h>
 #include <wx/spinbutt.h>
 #include <wx/dynarray.h>
 #include <wx/slider.h>
 #include <wx/spinbutt.h>
 #include <wx/dynarray.h>

+#include <wx/statline.h>

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


@@ -26,7 +27,6 @@
 
 #ifdef __WXGTK__
 #include <wx/checklst.h>
 
 #ifdef __WXGTK__
 #include <wx/checklst.h>

-#include <wx/statline.h>

 #endif
 
 %}
 #endif
 
 %}


@@ -51,11 +51,17 @@
 wxValidator wxPyDefaultValidator;       // Non-const default because of SWIG
 %}
 
 wxValidator wxPyDefaultValidator;       // Non-const default because of SWIG
 %}
 

+%readonly
+wxValidator wxDefaultValidator;
+%readwrite
+

 //----------------------------------------------------------------------
 
 class wxControl : public wxWindow {
 public:
 //----------------------------------------------------------------------
 
 class wxControl : public wxWindow {
 public:

+#ifdef __WXMSW__

     void Command(wxCommandEvent& event);
     void Command(wxCommandEvent& event);

+#endif

     wxString GetLabel();
     void SetLabel(const wxString& label);
 };
     wxString GetLabel();
     void SetLabel(const wxString& label);
 };


@@ -180,7 +186,7 @@ public:
     // TODO:    void SetClientData(const int n, char* data);
     void SetInsertionPoint(long pos);
     void SetInsertionPointEnd();
     // TODO:    void SetClientData(const int n, char* data);
     void SetInsertionPoint(long pos);
     void SetInsertionPointEnd();

-    //void SetSelection(int n, int select = TRUE);  **** Just use the one in wxChoice
+    void SetSelection(int n);

     %name(SetMark)void SetSelection(long from, long to);
     void SetValue(const wxString& text);
 };
     %name(SetMark)void SetSelection(long from, long to);
     void SetValue(const wxString& text);
 };


@@ -222,7 +228,7 @@ public:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-#ifdef __WXGTK__
+

 class wxStaticLine : public wxControl {
 public:
     wxStaticLine( wxWindow *parent, wxWindowID id,
 class wxStaticLine : public wxControl {
 public:
     wxStaticLine( wxWindow *parent, wxWindowID id,


@@ -231,7 +237,7 @@ public:
                   long style = wxLI_HORIZONTAL,
                   const char* name = "staticLine" );
 };
                   long style = wxLI_HORIZONTAL,
                   const char* name = "staticLine" );
 };

-#endif
+

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 


@@ -285,6 +291,8 @@ public:
       }
     }
 
       }
     }
 

+    void InsertItems(int LCOUNT, wxString* LIST, int pos);
+

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


@@ -424,6 +432,7 @@ public:
 
     const wxBitmap& GetBitmap();
     void SetBitmap(const wxBitmap& bitmap);
 
     const wxBitmap& GetBitmap();
     void SetBitmap(const wxBitmap& bitmap);

+    void SetIcon(const wxIcon& icon);

 };
 
 //----------------------------------------------------------------------
 };
 
 //----------------------------------------------------------------------


@@ -517,95 +526,3 @@ public:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-
-/////////////////////////////////////////////////////////////////////////////
-//
-// $Log$
-// Revision 1.15  1999/06/22 17:45:18  RD
-// wxPython 2.1b1:  Very minor changes needed for wxGTK
-//
-// Revision 1.14  1999/06/22 07:03:02  RD
-//
-// wxPython 2.1b1 for wxMSW  (wxGTK coming soon)
-// Lots of changes, see the README.txt for details...
-//
-// Revision 1.13  1999/04/30 21:13:43  RD
-//
-// wxPython 2.0b9, first phase (win32)
-// Added gobs of stuff, see wxPython/README.txt for details
-//
-// 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
-//
-// wxPython 0.5.2
-// Minor fixes and SWIG code generation for RR's changes.  MSW and GTK
-// versions are much closer now!
-//
-// Revision 1.9  1998/12/17 14:07:29  RR
-//
-//   Removed minor differences between wxMSW and wxGTK
-//
-// Revision 1.8  1998/12/15 20:41:15  RD
-// Changed the import semantics from "from wxPython import *" to "from
-// wxPython.wx import *"  This is for people who are worried about
-// namespace pollution, they can use "from wxPython import wx" and then
-// prefix all the wxPython identifiers with "wx."
-//
-// Added wxTaskbarIcon for wxMSW.
-//
-// Made the events work for wxGrid.
-//
-// Added wxConfig.
-//
-// Added wxMiniFrame for wxGTK, (untested.)
-//
-// Changed many of the args and return values that were pointers to gdi
-// objects to references to reflect changes in the wxWindows API.
-//
-// Other assorted fixes and additions.
-//
-// Revision 1.7  1998/11/16 00:00:53  RD
-// Generic treectrl for wxPython/GTK compiles...
-//
-// Revision 1.6  1998/11/15 23:03:43  RD
-// Removing some ifdef's for wxGTK
-//
-// Revision 1.5  1998/10/07 07:34:32  RD
-// Version 0.4.1 for wxGTK
-//
-// Revision 1.4  1998/10/02 06:40:35  RD
-//
-// Version 0.4 of wxPython for MSW.
-//
-// Revision 1.3  1998/08/18 19:48:14  RD
-// more wxGTK compatibility things.
-//
-// It builds now but there are serious runtime problems...
-//
-// Revision 1.2  1998/08/15 07:36:28  RD
-// - Moved the header in the .i files out of the code that gets put into
-// the .cpp files.  It caused CVS conflicts because of the RCS ID being
-// different each time.
-//
-// - A few minor fixes.
-//
-// Revision 1.1  1998/08/09 08:25:49  RD
-// Initial version
-//
-//
-