added wxImage::CanRead

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

diff --git a/utils/wxPython/src/controls.i b/utils/wxPython/src/controls.i
index 605a9d697c97a89bb11248c109be464040560dd6..86727f10e2b8e048474b7262132aa6e152a373ac 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/statline.h>
 
 #ifdef __WXMSW__
 #if wxUSE_OWNER_DRAWN
@@ -27,6 +28,7 @@
 #ifdef __WXGTK__
 #include <wx/checklst.h>
 #endif
+
 %}
 
 //----------------------------------------------------------------------
@@ -53,7 +55,9 @@ wxValidator wxPyDefaultValidator;       // Non-const default because of SWIG
 
 class wxControl : public wxWindow {
 public:
+#ifdef __WXMSW__
     void Command(wxCommandEvent& event);
+#endif
     wxString GetLabel();
     void SetLabel(const wxString& label);
 };
@@ -144,7 +148,7 @@ public:
 
 //----------------------------------------------------------------------
 
-class wxComboBox : public wxControl {
+class wxComboBox : public wxChoice {
 public:
     wxComboBox(wxWindow* parent, wxWindowID id, char* value = "",
                const wxPoint& pos = wxPyDefaultPosition,
@@ -178,7 +182,7 @@ public:
     // TODO:    void SetClientData(const int n, char* data);
     void SetInsertionPoint(long pos);
     void SetInsertionPointEnd();
-    void SetSelection(int n, bool select = TRUE);
+    void SetSelection(int n);
     %name(SetMark)void SetSelection(long from, long to);
     void SetValue(const wxString& text);
 };
@@ -218,6 +222,19 @@ public:
 };
 
 
+//----------------------------------------------------------------------
+
+
+class wxStaticLine : public wxControl {
+public:
+    wxStaticLine( wxWindow *parent, wxWindowID id,
+                  const wxPoint &pos = wxPyDefaultPosition,
+                  const wxSize &size = wxPyDefaultSize,
+                  long style = wxLI_HORIZONTAL,
+                  const char* name = "staticLine" );
+};
+
+
 //----------------------------------------------------------------------
 
 class wxStaticText : public wxControl {
@@ -344,6 +361,14 @@ public:
     void WriteText(const wxString& text);
     void AppendText(const wxString& text);
     long XYToPosition(long x, long y);
+
+    bool CanCopy();
+    bool CanCut();
+    bool CanPaste();
+    bool CanRedo();
+    bool CanUndo();
+    void GetSelection(long* OUTPUT, long* OUTPUT);
+    bool IsEditable();
 };
 
 //----------------------------------------------------------------------
@@ -401,6 +426,7 @@ public:
 
     const wxBitmap& GetBitmap();
     void SetBitmap(const wxBitmap& bitmap);
+    void SetIcon(const wxIcon& icon);
 };
 
 //----------------------------------------------------------------------
@@ -422,15 +448,15 @@ public:
     void Enable(bool enable);
     %name(EnableItem)void Enable(int n, bool enable);
     int FindString(const wxString& string);
-#ifdef __WXMSW__
-    wxString GetLabel();
-#endif
+
+//***    wxString GetLabel();
+//***    void SetLabel(const wxString& label);
+
     %name(GetItemLabel)wxString GetLabel(int n);
     int GetSelection();
     wxString GetString(int n);
     wxString GetStringSelection();
     int Number();
-    void SetLabel(const wxString& label);
     %name(SetItemLabel)void SetLabel(int n, const wxString& label);
     void SetSelection(int n);
     void SetStringSelection(const wxString& string);
@@ -498,7 +524,73 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.17  1999/08/18 07:41:28  RD
+// Using a new version of SWIG
+//
+// A few minor fixes
+//
+// Revision 1.16  1999/07/31 07:54:35  RD
+//
+// wxPython 2.1b1:
+//
+//     Added the missing wxWindow.GetUpdateRegion() method.
+//
+//     Made a new change in SWIG (update your patches everybody) that
+//     provides a fix for global shadow objects that get an exception in
+//     their __del__ when their extension module has already been deleted.
+//     It was only a 1 line change in .../SWIG/Modules/pycpp.cxx at about
+//     line 496 if you want to do it by hand.
+//
+//     It is now possible to run through MainLoop more than once in any one
+//     process.  The cleanup that used to happen as MainLoop completed (and
+//     prevented it from running again) has been delayed until the wxc module
+//     is being unloaded by Python.
+//
+//     wxWindow.PopupMenu() now takes a wxPoint instead of  x,y.  Added
+//     wxWindow.PopupMenuXY to be consistent with some other methods.
+//
+//     Added wxGrid.SetEditInPlace and wxGrid.GetEditInPlace.
+//
+//     You can now provide your own app.MainLoop method.  See
+//     wxPython/demo/demoMainLoop.py for an example and some explaination.
+//
+//     Got the in-place-edit for the wxTreeCtrl fixed and added some demo
+//     code to show how to use it.
+//
+//     Put the wxIcon constructor back in for GTK as it now has one that
+//     matches MSW's.
+//
+//     Added wxGrid.GetCells
+//
+//     Added wxSystemSettings static methods as functions with names like
+//     wxSystemSettings_GetSystemColour.
+//
+//     Removed wxPyMenu since using menu callbacks have been depreciated in
+//     wxWindows.  Use wxMenu and events instead.
+//
+//     Added alternate wxBitmap constructor (for MSW only) as
+//           wxBitmapFromData(data, type, width, height, depth = 1)
+//
+//     Added a helper function named wxPyTypeCast that can convert shadow
+//     objects of one type into shadow objects of another type.  (Like doing
+//     a down-cast.)  See the implementation in wx.py for some docs.
+//
+// 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
 //