it is now possible to add custom buttons into wxHtmlHelpFrame's toolbar

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

diff --git a/utils/wxPython/src/controls.i b/utils/wxPython/src/controls.i
index 5e92ebe7adce372d23a8fba53e0c5469b1ee03f8..f695ceb0bbdc1fa756455b3c6f765168ae7a5eba 100644 (file)
--- a/utils/wxPython/src/controls.i
+++ b/utils/wxPython/src/controls.i
@@ -18,6 +18,7 @@
 #include <wx/spinbutt.h>
 #include <wx/dynarray.h>
 #include <wx/statline.h>
 #include <wx/spinbutt.h>
 #include <wx/dynarray.h>
 #include <wx/statline.h>

+//#include <wx/toggbutt.h>

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


@@ -51,17 +52,30 @@
 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__
+    wxControl(wxWindow *parent,
+                       wxWindowID id,
+                       const wxPoint& pos=wxPyDefaultPosition,
+                       const wxSize& size=wxPyDefaultSize,
+                       long style=0,
+                       const wxValidator& validator=wxPyDefaultValidator,
+                       const char* name="control");
+
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+

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

-#endif

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

+

 //----------------------------------------------------------------------
 
 class wxButton : public wxControl {
 //----------------------------------------------------------------------
 
 class wxButton : public wxControl {


@@ -76,8 +90,17 @@ public:
     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 
     void SetDefault();
     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 
     void SetDefault();

+    void SetBackgroundColour(const wxColour& colour);
+    void SetForegroundColour(const wxColour& colour);

 };
 
 };
 

+
+%inline %{
+    wxSize wxButton_GetDefaultSize() {
+        return wxButton::GetDefaultSize();
+    }
+%}
+

 //----------------------------------------------------------------------
 
 class wxBitmapButton : public wxButton {
 //----------------------------------------------------------------------
 
 class wxBitmapButton : public wxButton {


@@ -102,6 +125,31 @@ public:
 
 };
 
 
 };
 

+//----------------------------------------------------------------------
+
+//  class wxToggleButton : public wxControl {
+//  public:
+//      wxToggleButton(wxWindow *parent, wxWindowID id, const wxString& label,
+//                     const wxPoint& pos = wxPyDefaultPosition,
+//                     const wxSize& size = wxPyDefaultSize, long style = 0,
+//                     const wxValidator& validator = wxPyDefaultValidator,
+//                     const char* name = "toggle");
+//      void SetValue(bool value);
+//      bool GetValue() const ;
+//      void SetLabel(const wxString& label);
+//  };
+
+//  class wxBitmapToggleButton : public wxToggleButton {
+//  public:
+//      wxBitmapToggleButton(wxWindow *parent, wxWindowID id, const wxBitmap *label,
+//                           const wxPoint& pos = wxPyDefaultPosition,
+//                           const wxSize& size = wxPyDefaultSize, long style = 0,
+//                           const wxValidator& validator = wxPyDefaultValidator,
+//                           const char *name = "toggle");
+//      void SetLabel(const wxBitmap& bitmap);
+//  };
+
+

 //----------------------------------------------------------------------
 
 class wxCheckBox : public wxControl {
 //----------------------------------------------------------------------
 
 class wxCheckBox : public wxControl {


@@ -287,6 +335,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();


@@ -317,7 +367,8 @@ public:
     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 
     bool  IsChecked(int uiIndex);
     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 
     bool  IsChecked(int uiIndex);

-    void  Check(int uiIndex, bool bCheck = TRUE);
+    void  Check(int uiIndex, int bCheck = TRUE);
+    void InsertItems(int LCOUNT, wxString* LIST, int pos);

 
     int GetItemHeight();
 };
 
     int GetItemHeight();
 };


@@ -369,6 +420,14 @@ public:
     bool CanUndo();
     void GetSelection(long* OUTPUT, long* OUTPUT);
     bool IsEditable();
     bool CanUndo();
     void GetSelection(long* OUTPUT, long* OUTPUT);
     bool IsEditable();

+    void Undo();
+    void Redo();
+
+    %addmethods {
+        void write(const wxString& text) {
+            self->AppendText(text + '\n');
+        }
+    }

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