MouseWheel stuff

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

diff --git a/wxPython/src/controls.i b/wxPython/src/controls.i
index 2e8f3e4f1f651990dd631ca2e22fe2cd0f2e415c..e00e3b974a74173f2e8d4a540aa1d88bc43ffc76 100644 (file)
--- a/wxPython/src/controls.i
+++ b/wxPython/src/controls.i
@@ -19,7 +19,7 @@
 #include <wx/spinctrl.h>
 #include <wx/dynarray.h>
 #include <wx/statline.h>
-//#include <wx/toggbutt.h>
+#include <wx/tglbtn.h>
 
 #ifdef __WXMSW__
 #if wxUSE_OWNER_DRAWN
@@ -125,31 +125,6 @@ public:
     int GetMarginY() const { return m_marginY; }
 };
 
-//----------------------------------------------------------------------
-
-//  class wxToggleButton : public wxControl {
-//  public:
-//      wxToggleButton(wxWindow *parent, wxWindowID id, const wxString& label,
-//                     const wxPoint& pos = wxDefaultPosition,
-//                     const wxSize& size = wxDefaultSize, long style = 0,
-//                     const wxValidator& validator = wxDefaultValidator,
-//                     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 = wxDefaultPosition,
-//                           const wxSize& size = wxDefaultSize, long style = 0,
-//                           const wxValidator& validator = wxDefaultValidator,
-//                           const char *name = "toggle");
-//      void SetLabel(const wxBitmap& bitmap);
-//  };
-
-
 //----------------------------------------------------------------------
 
 class wxCheckBox : public wxControl {
@@ -603,5 +578,28 @@ public:
 
 //----------------------------------------------------------------------
 
+enum { wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, };
+
+class wxToggleButton : public wxControl {
+public:
+    wxToggleButton(wxWindow *parent,
+                   wxWindowID id,
+                   const wxString& label,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = 0,
+                   const wxValidator& validator = wxDefaultValidator,
+                   const char* name = "toggle");
+
+    void SetValue(bool value);
+    bool GetValue() const ;
+    void SetLabel(const wxString& label);
+
+};
+
+//----------------------------------------------------------------------
+//----------------------------------------------------------------------
+//----------------------------------------------------------------------
+