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 59c98cb7a90467cd054a9477f13a681fc97d6f60..f695ceb0bbdc1fa756455b3c6f765168ae7a5eba 100644 (file)
--- a/utils/wxPython/src/controls.i
+++ b/utils/wxPython/src/controls.i
@@ -60,44 +60,22 @@ wxValidator wxDefaultValidator;
 
 class wxControl : public wxWindow {
 public:
-    wxControl();
+    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)"
 
-#ifdef __WXMSW__
     void Command(wxCommandEvent& event);
-#endif
     wxString GetLabel();
     void SetLabel(const wxString& label);
 };
 
 
-//  %{
-//  class wxPyControl : public wxControl {
-//  public:
-//      wxPyControl(wxWindow *parent,
-//                  wxWindowID id,
-//                  const wxPoint& pos,
-//                  const wxSize& size,
-//                  long style,
-//                  const wxValidator& validator,
-//                  const wxString& name)
-//          : wxControl() {
-//          CreateControl(parent, id, pos, size, style, validator, name);
-//      }
-//  };
-//  %}
-
-
-//  class wxPyControl : public wxControl {
-//  public:
-//      wxPyControl(wxWindow* parent, wxWindowID id,
-//                  const wxPoint& pos = wxPyDefaultPosition,
-//                  const wxSize& size = wxPyDefaultSize,
-//                  long style = 0,
-//                  const wxValidator& validator = wxPyDefaultValidator,
-//                  char* name = "control");
-//  };
-
-
 //----------------------------------------------------------------------
 
 class wxButton : public wxControl {
@@ -112,6 +90,8 @@ public:
     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 
     void SetDefault();
+    void SetBackgroundColour(const wxColour& colour);
+    void SetForegroundColour(const wxColour& colour);
 };