Emptied patch.rsp

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

diff --git a/wxPython/src/controls.i b/wxPython/src/controls.i
index 951d3443587a13db60715f135b465259abae8474..a622b6145d148d5aeeb0c2201d82c87d6b5de77f 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/spinctrl.h>
 #include <wx/dynarray.h>
 #include <wx/statline.h>

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

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


@@ -49,10 +49,6 @@
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-%{
-wxValidator wxPyDefaultValidator;       // Non-const default because of SWIG
-%}
-

 %readonly
 wxValidator wxDefaultValidator;
 %readwrite
 %readonly
 wxValidator wxDefaultValidator;
 %readwrite


@@ -63,13 +59,23 @@ class wxControl : public wxWindow {
 public:
     wxControl(wxWindow *parent,
                        wxWindowID id,
 public:
     wxControl(wxWindow *parent,
                        wxWindowID id,

-                       const wxPoint& pos=wxPyDefaultPosition,
-                       const wxSize& size=wxPyDefaultSize,
+                       const wxPoint& pos=wxDefaultPosition,
+                       const wxSize& size=wxDefaultSize,

                        long style=0,
                        long style=0,

-                       const wxValidator& validator=wxPyDefaultValidator,
+                       const wxValidator& validator=wxDefaultValidator,

                        const char* name="control");
                        const char* name="control");

+    %name(wxPreControl)wxControl();

 
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    bool Create(wxWindow *parent,
+                       wxWindowID id,
+                       const wxPoint& pos=wxDefaultPosition,
+                       const wxSize& size=wxDefaultSize,
+                       long style=0,
+                       const wxValidator& validator=wxDefaultValidator,
+                       const char* name="control");
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreControl:val._setOORInfo(val)"

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


@@ -79,46 +85,113 @@ public:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

+
+class wxControlWithItems : public wxControl {
+public:
+
+    // void Clear();  ambiguous, redefine below...
+    void Delete(int n);
+
+    int GetCount();
+    %pragma(python) addtoclass = "Number = GetCount"
+    wxString GetString(int n);
+    void SetString(int n, const wxString& s);
+    int FindString(const wxString& s);
+
+    void Select(int n);
+    int GetSelection();
+
+    wxString GetStringSelection() const;
+
+    //   void Append(const wxString& item);
+    //   void Append(const wxString& item, char* clientData);
+    //   char* GetClientData(const int n);
+    //   void SetClientData(const int n, char* data);
+    %addmethods {
+        void Append(const wxString& item, PyObject* clientData=NULL) {
+            if (clientData) {
+                wxPyClientData* data = new wxPyClientData(clientData);
+                self->Append(item, data);
+            } else
+                self->Append(item);
+        }
+
+        PyObject* GetClientData(int n) {
+            wxPyClientData* data = (wxPyClientData*)self->GetClientObject(n);
+            if (data) {
+                Py_INCREF(data->m_obj);
+                return data->m_obj;
+            } else {
+                Py_INCREF(Py_None);
+                return Py_None;
+            }
+        }
+
+        void SetClientData(int n, PyObject* clientData) {
+            wxPyClientData* data = new wxPyClientData(clientData);
+            self->SetClientObject(n, data);
+        }
+    }
+
+};
+//----------------------------------------------------------------------
+

 class wxButton : public wxControl {
 public:
     wxButton(wxWindow* parent, wxWindowID id, const wxString& label,
 class wxButton : public wxControl {
 public:
     wxButton(wxWindow* parent, wxWindowID id, const wxString& label,

-             const wxPoint& pos = wxPyDefaultPosition,
-             const wxSize& size = wxPyDefaultSize,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             long style = 0,
+             const wxValidator& validator = wxDefaultValidator,
+             char* name = "button");
+    %name(wxPreButton)wxButton();
+
+    bool Create(wxWindow* parent, wxWindowID id, const wxString& label,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,

              long style = 0,
              long style = 0,

-             const wxValidator& validator = wxPyDefaultValidator,
+             const wxValidator& validator = wxDefaultValidator,

              char* name = "button");
 
              char* name = "button");
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreButton:val._setOORInfo(val)"

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

+#ifdef __WXMSW__
+    void SetImageLabel(const wxBitmap& bitmap);
+    void SetImageMargins(wxCoord x, wxCoord y);
+#endif
+    static wxSize GetDefaultSize();

 };
 
 };
 

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

 //----------------------------------------------------------------------
 
 class wxBitmapButton : public wxButton {
 public:
     wxBitmapButton(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap,
 //----------------------------------------------------------------------
 
 class wxBitmapButton : public wxButton {
 public:
     wxBitmapButton(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap,

-                   const wxPoint& pos = wxPyDefaultPosition,
-                   const wxSize& size = wxPyDefaultSize,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,

                    long style = wxBU_AUTODRAW,
                    long style = wxBU_AUTODRAW,

-                   const wxValidator& validator = wxPyDefaultValidator,
+                   const wxValidator& validator = wxDefaultValidator,

                    char* name = "button");
                    char* name = "button");

+    %name(wxPreBitmapButton)wxBitmapButton();

 
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    bool Create(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = wxBU_AUTODRAW,
+                   const wxValidator& validator = wxDefaultValidator,
+                   char* name = "button");
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreBitmapButton:val._setOORInfo(val)"

 
 

-    wxBitmap& GetBitmapLabel();
-    wxBitmap& GetBitmapDisabled();
-    wxBitmap& GetBitmapFocus();
-    wxBitmap& GetBitmapSelected();
+    wxBitmap GetBitmapLabel();
+    wxBitmap GetBitmapDisabled();
+    wxBitmap GetBitmapFocus();
+    wxBitmap GetBitmapSelected();

     void SetBitmapDisabled(const wxBitmap& bitmap);
     void SetBitmapFocus(const wxBitmap& bitmap);
     void SetBitmapSelected(const wxBitmap& bitmap);
     void SetBitmapDisabled(const wxBitmap& bitmap);
     void SetBitmapFocus(const wxBitmap& bitmap);
     void SetBitmapSelected(const wxBitmap& bitmap);


@@ -129,43 +202,27 @@ public:
     int GetMarginY() const { return m_marginY; }
 };
 
     int GetMarginY() const { return m_marginY; }
 };
 

-//----------------------------------------------------------------------
-
-//  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 {
 public:
     wxCheckBox(wxWindow* parent, wxWindowID id, const wxString& label,
 //----------------------------------------------------------------------
 
 class wxCheckBox : public wxControl {
 public:
     wxCheckBox(wxWindow* parent, wxWindowID id, const wxString& label,

-               const wxPoint& pos = wxPyDefaultPosition,
-               const wxSize& size = wxPyDefaultSize,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = 0,
+               const wxValidator& val = wxDefaultValidator,
+               char* name = "checkBox");
+    %name(wxPreCheckBox)wxCheckBox();
+
+    bool Create(wxWindow* parent, wxWindowID id, const wxString& label,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,

                long style = 0,
                long style = 0,

-               const wxValidator& val = wxPyDefaultValidator,
+               const wxValidator& val = wxDefaultValidator,

                char* name = "checkBox");
 
                char* name = "checkBox");
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreCheckBox:val._setOORInfo(val)"

 
     bool GetValue();
     void SetValue(const bool state);
 
     bool GetValue();
     void SetValue(const bool state);


@@ -173,84 +230,201 @@ public:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-class wxChoice : public wxControl {
+class wxChoice : public wxControlWithItems {

 public:
     wxChoice(wxWindow *parent, wxWindowID id,
 public:
     wxChoice(wxWindow *parent, wxWindowID id,

-             const wxPoint& pos = wxPyDefaultPosition,
-             const wxSize& size = wxPyDefaultSize,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,

              int LCOUNT=0, wxString* choices=NULL,
              long style = 0,
              int LCOUNT=0, wxString* choices=NULL,
              long style = 0,

-             const wxValidator& validator = wxPyDefaultValidator,
+             const wxValidator& validator = wxDefaultValidator,

              char* name = "choice");
              char* name = "choice");

+    %name(wxPreChoice)wxChoice();

 
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    bool Create(wxWindow *parent, wxWindowID id,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             int LCOUNT=0, wxString* choices=NULL,
+             long style = 0,
+             const wxValidator& validator = wxDefaultValidator,
+             char* name = "choice");
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreChoice:val._setOORInfo(val)"

 
 

-    void Append(const wxString& item);

     void Clear();
     void Clear();

-    int FindString(const wxString& string);
+

     int GetColumns();
     int GetColumns();

-    int GetSelection();
-    wxString GetString(const int n);
-    wxString GetStringSelection();
-    int Number();

     void SetColumns(const int n = 1);
     void SetSelection(const int n);
     void SetStringSelection(const wxString& string);
     void SetColumns(const int n = 1);
     void SetSelection(const int n);
     void SetStringSelection(const wxString& string);

+    void SetString(int n, const wxString& s);
+
+    %pragma(python) addtoclass = "
+    Select = SetSelection
+    "

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

-class wxComboBox : public wxChoice {
+// wxGTK's wxComboBox doesn't derive from wxChoice like wxMSW, or
+// even wxControlWithItems, so we have to duplicate the methods
+// here... <blech!>
+
+#ifdef __WXGTK__
+class wxComboBox : public wxControl
+{

 public:
     wxComboBox(wxWindow* parent, wxWindowID id, char* value = "",
 public:
     wxComboBox(wxWindow* parent, wxWindowID id, char* value = "",

-               const wxPoint& pos = wxPyDefaultPosition,
-               const wxSize& size = wxPyDefaultSize,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               int LCOUNT=0, wxString* choices=NULL,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               char* name = "comboBox");
+    %name(wxPreComboBox)wxComboBox();
+
+    bool Create(wxWindow* parent, wxWindowID id, char* value = "",
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,

                int LCOUNT=0, wxString* choices=NULL,
                long style = 0,
                int LCOUNT=0, wxString* choices=NULL,
                long style = 0,

-               const wxValidator& validator = wxPyDefaultValidator,
+               const wxValidator& validator = wxDefaultValidator,

                char* name = "comboBox");
 
                char* name = "comboBox");
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreComboBox:val._setOORInfo(val)"

 
 

-    void Append(const wxString& item);
-    // TODO: void Append(const wxString& item, char* clientData);
-    void Clear();

     void Copy();
     void Cut();
     void Copy();
     void Cut();

-    void Delete(int n);
-    // NotMember??:    void Deselect(int n);
-    int FindString(const wxString& string);
-    // TODO: char* GetClientData(const int n);

     long GetInsertionPoint();
     long GetLastPosition();
     long GetInsertionPoint();
     long GetLastPosition();

-    int GetSelection();
+    wxString GetValue();
+    void Paste();
+    void Replace(long from, long to, const wxString& text);
+    void Remove(long from, long to);
+    void SetInsertionPoint(long pos);
+    void SetInsertionPointEnd();
+    void SetSelection(int n);
+    %name(SetMark)void SetSelection(long from, long to);
+    void SetValue(const wxString& text);
+    void SetEditable(bool editable);
+
+
+    void Clear();
+    void Delete(int n);
+
+    int GetCount();
+    %pragma(python) addtoclass = "Number = GetCount"

     wxString GetString(int n);
     wxString GetString(int n);

-    wxString GetStringSelection();
+    int FindString(const wxString& s);
+
+    //void SetString(int n, const wxString& s);  *** No equivalent for wxGTK!!!
+
+    // void Select(int n);
+    %pragma(python) addtoclass = "Select = SetSelection"
+
+    int GetSelection();
+    wxString GetStringSelection() const;
+
+    //   void Append(const wxString& item);
+    //   void Append(const wxString& item, char* clientData);
+    //   char* GetClientData(const int n);
+    //   void SetClientData(const int n, char* data);
+    %addmethods {
+        void Append(const wxString& item, PyObject* clientData=NULL) {
+            if (clientData) {
+                wxPyClientData* data = new wxPyClientData(clientData);
+                self->Append(item, data);
+            } else
+                self->Append(item);
+        }
+
+        PyObject* GetClientData(int n) {
+            wxPyClientData* data = (wxPyClientData*)self->GetClientObject(n);
+            if (data) {
+                Py_INCREF(data->m_obj);
+                return data->m_obj;
+            } else {
+                Py_INCREF(Py_None);
+                return Py_None;
+            }
+        }
+
+        void SetClientData(int n, PyObject* clientData) {
+            wxPyClientData* data = new wxPyClientData(clientData);
+            self->SetClientObject(n, data);
+        }
+    }
+
+};
+
+
+
+#else  // For all but wxGTK
+
+
+class wxComboBox : public wxChoice {
+public:
+    wxComboBox(wxWindow* parent, wxWindowID id, char* value = "",
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               int LCOUNT=0, wxString* choices=NULL,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               char* name = "comboBox");
+    %name(wxPreComboBox)wxComboBox();
+
+    bool Create(wxWindow* parent, wxWindowID id, char* value = "",
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               int LCOUNT=0, wxString* choices=NULL,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               char* name = "comboBox");
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreComboBox:val._setOORInfo(val)"
+
+    void Copy();
+    void Cut();
+    long GetInsertionPoint();
+    long GetLastPosition();

     wxString GetValue();
     wxString GetValue();

-    int Number();

     void Paste();
     void Replace(long from, long to, const wxString& text);
     void Remove(long from, long to);
     void Paste();
     void Replace(long from, long to, const wxString& text);
     void Remove(long from, long to);

-    // TODO:    void SetClientData(const int n, char* data);

     void SetInsertionPoint(long pos);
     void SetInsertionPointEnd();
     void SetSelection(int n);
     %name(SetMark)void SetSelection(long from, long to);
     void SetValue(const wxString& text);
     void SetInsertionPoint(long pos);
     void SetInsertionPointEnd();
     void SetSelection(int n);
     %name(SetMark)void SetSelection(long from, long to);
     void SetValue(const wxString& text);

+    void SetEditable(bool editable);

 };
 };

+#endif
+

 
 //----------------------------------------------------------------------
 
 class wxGauge : public wxControl {
 public:
     wxGauge(wxWindow* parent, wxWindowID id, int range,
 
 //----------------------------------------------------------------------
 
 class wxGauge : public wxControl {
 public:
     wxGauge(wxWindow* parent, wxWindowID id, int range,

-            const wxPoint& pos = wxPyDefaultPosition,
-            const wxSize& size = wxPyDefaultSize,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = wxGA_HORIZONTAL,
+            const wxValidator& validator = wxDefaultValidator,
+            char* name = "gauge");
+    %name(wxPreGauge)wxGauge();
+
+    bool Create(wxWindow* parent, wxWindowID id, int range,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,

             long style = wxGA_HORIZONTAL,
             long style = wxGA_HORIZONTAL,

-            const wxValidator& validator = wxPyDefaultValidator,
+            const wxValidator& validator = wxDefaultValidator,

             char* name = "gauge");
 
             char* name = "gauge");
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreGauge:val._setOORInfo(val)"

 
     int GetBezelFace();
     int GetRange();
 
     int GetBezelFace();
     int GetRange();


@@ -267,10 +441,20 @@ public:
 class wxStaticBox : public wxControl {
 public:
     wxStaticBox(wxWindow* parent, wxWindowID id, const wxString& label,
 class wxStaticBox : public wxControl {
 public:
     wxStaticBox(wxWindow* parent, wxWindowID id, const wxString& label,

-                const wxPoint& pos = wxPyDefaultPosition,
-                const wxSize& size = wxPyDefaultSize,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                char* name = "staticBox");
+    %name(wxPreStaticBox)wxStaticBox();
+
+    bool Create(wxWindow* parent, wxWindowID id, const wxString& label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,

                 long style = 0,
                 char* name = "staticBox");
                 long style = 0,
                 char* name = "staticBox");

+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreStaticBox:val._setOORInfo(val)"

 };
 
 
 };
 
 


@@ -280,10 +464,20 @@ public:
 class wxStaticLine : public wxControl {
 public:
     wxStaticLine( wxWindow *parent, wxWindowID id,
 class wxStaticLine : public wxControl {
 public:
     wxStaticLine( wxWindow *parent, wxWindowID id,

-                  const wxPoint &pos = wxPyDefaultPosition,
-                  const wxSize &size = wxPyDefaultSize,
+                  const wxPoint &pos = wxDefaultPosition,
+                  const wxSize &size = wxDefaultSize,
+                  long style = wxLI_HORIZONTAL,
+                  const char* name = "staticLine" );
+    %name(wxPreStaticLine)wxStaticLine();
+
+    bool Create( wxWindow *parent, wxWindowID id,
+                  const wxPoint &pos = wxDefaultPosition,
+                  const wxSize &size = wxDefaultSize,

                   long style = wxLI_HORIZONTAL,
                   const char* name = "staticLine" );
                   long style = wxLI_HORIZONTAL,
                   const char* name = "staticLine" );

+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreStaticLine:val._setOORInfo(val)"

 };
 
 
 };
 
 


@@ -292,12 +486,20 @@ public:
 class wxStaticText : public wxControl {
 public:
     wxStaticText(wxWindow* parent, wxWindowID id, const wxString& label,
 class wxStaticText : public wxControl {
 public:
     wxStaticText(wxWindow* parent, wxWindowID id, const wxString& label,

-                 const wxPoint& pos = wxPyDefaultPosition,
-                 const wxSize& size = wxPyDefaultSize,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,

                  long style = 0,
                  char* name = "staticText");
                  long style = 0,
                  char* name = "staticText");

+    %name(wxPreStaticText)wxStaticText();

 
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    bool Create(wxWindow* parent, wxWindowID id, const wxString& label,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = 0,
+                 char* name = "staticText");
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreStaticText:val._setOORInfo(val)"

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


@@ -305,26 +507,30 @@ public:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-class wxListBox : public wxControl {
+class wxListBox : public wxControlWithItems {

 public:
     wxListBox(wxWindow* parent, wxWindowID id,
 public:
     wxListBox(wxWindow* parent, wxWindowID id,

-              const wxPoint& pos = wxPyDefaultPosition,
-              const wxSize& size = wxPyDefaultSize,
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize,

               int LCOUNT, wxString* choices = NULL,
               long style = 0,
               int LCOUNT, wxString* choices = NULL,
               long style = 0,

-              const wxValidator& validator = wxPyDefaultValidator,
+              const wxValidator& validator = wxDefaultValidator,

               char* name = "listBox");
               char* name = "listBox");

+    %name(wxPreListBox)wxListBox();

 
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    bool Create(wxWindow* parent, wxWindowID id,
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize,
+              int LCOUNT, wxString* choices = NULL,
+              long style = 0,
+              const wxValidator& validator = wxDefaultValidator,
+              char* name = "listBox");
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreListBox:val._setOORInfo(val)"

 
 

-    void Append(const wxString& item);
-    // TODO:    void Append(const wxString& item, char* clientData);

     void Clear();
     void Clear();

-    void Delete(int n);

     void Deselect(int n);
     void Deselect(int n);

-    int FindString(const wxString& string);
-    // TODO:    char* GetClientData(const int n);
-    int GetSelection();

 
     // int GetSelections(int **selections);
     %addmethods {
 
     // int GetSelections(int **selections);
     %addmethods {


@@ -339,14 +545,12 @@ public:
       }
     }
 
       }
     }
 

+

     void InsertItems(int LCOUNT, wxString* choices, int pos);
 
     void InsertItems(int LCOUNT, wxString* choices, int pos);
 

-    wxString GetString(int n);
-    wxString GetStringSelection();
-    int Number();
+    bool IsSelected(const int n);

     bool Selected(const int n);
     void Set(int LCOUNT, wxString* choices);
     bool Selected(const int n);
     void Set(int LCOUNT, wxString* choices);

-    // TODO:    void SetClientData(const int n, char* data);

     void SetFirstItem(int n);
     %name(SetFirstItemStr)void SetFirstItem(const wxString& string);
     void SetSelection(int n, bool select = TRUE);
     void SetFirstItem(int n);
     %name(SetFirstItemStr)void SetFirstItem(const wxString& string);
     void SetSelection(int n, bool select = TRUE);


@@ -360,76 +564,181 @@ public:
 class wxCheckListBox : public wxListBox {
 public:
     wxCheckListBox(wxWindow *parent, wxWindowID id,
 class wxCheckListBox : public wxListBox {
 public:
     wxCheckListBox(wxWindow *parent, wxWindowID id,

-                   const wxPoint& pos = wxPyDefaultPosition,
-                   const wxSize& size = wxPyDefaultSize,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,

                    int LCOUNT = 0,
                    wxString* choices = NULL,
                    long style = 0,
                    int LCOUNT = 0,
                    wxString* choices = NULL,
                    long style = 0,

-                   const wxValidator& validator = wxPyDefaultValidator,
+                   const wxValidator& validator = wxDefaultValidator,

                    char* name = "listBox");
                    char* name = "listBox");

+    %name(wxPreCheckListBox)wxCheckListBox();

 
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    bool Create(wxWindow *parent, wxWindowID id,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   int LCOUNT = 0,
+                   wxString* choices = NULL,
+                   long style = 0,
+                   const wxValidator& validator = wxDefaultValidator,
+                   char* name = "listBox");
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreCheckListBox:val._setOORInfo(val)"

 
     bool  IsChecked(int uiIndex);
     void  Check(int uiIndex, int bCheck = TRUE);
     void InsertItems(int LCOUNT, wxString* choices, int pos);
 
 
     bool  IsChecked(int uiIndex);
     void  Check(int uiIndex, int bCheck = TRUE);
     void InsertItems(int LCOUNT, wxString* choices, int pos);
 

+#ifndef __WXMAC__

     int GetItemHeight();
     int GetItemHeight();

+#endif

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

+
+class wxTextAttr
+{
+public:
+    // ctors
+    wxTextAttr(const wxColour& colText = wxNullColour,
+               const wxColour& colBack = wxNullColour,
+               const wxFont& font = wxNullFont);
+    ~wxTextAttr();
+
+    // setters
+    void SetTextColour(const wxColour& colText);
+    void SetBackgroundColour(const wxColour& colBack);
+    void SetFont(const wxFont& font);
+
+    // accessors
+    bool HasTextColour() const;
+    bool HasBackgroundColour() const;
+    bool HasFont() const;
+
+    wxColour GetTextColour() const;
+    wxColour GetBackgroundColour() const;
+    wxFont GetFont() const;
+
+    // returns false if we have any attributes set, true otherwise
+    bool IsDefault();
+
+    // return the attribute having the valid font and colours: it uses the
+    // attributes set in attr and falls back first to attrDefault and then to
+    // the text control font/colours for those attributes which are not set
+    static wxTextAttr Combine(const wxTextAttr& attr,
+                              const wxTextAttr& attrDef,
+                              const wxTextCtrl *text);
+};
+
+
+

 class wxTextCtrl : public wxControl {
 public:
     wxTextCtrl(wxWindow* parent, wxWindowID id, char* value = "",
 class wxTextCtrl : public wxControl {
 public:
     wxTextCtrl(wxWindow* parent, wxWindowID id, char* value = "",

-               const wxPoint& pos = wxPyDefaultPosition,
-               const wxSize& size = wxPyDefaultSize,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               char* name = "text");
+    %name(wxPreTextCtrl)wxTextCtrl();
+
+    bool Create(wxWindow* parent, wxWindowID id, char* value = "",
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,

                long style = 0,
                long style = 0,

-               const wxValidator& validator = wxPyDefaultValidator,
+               const wxValidator& validator = wxDefaultValidator,

                char* name = "text");
 
                char* name = "text");
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreTextCtrl:val._setOORInfo(val)"
+
+
+    wxString GetValue() const;
+    void SetValue(const wxString& value);
+
+    int GetLineLength(long lineNo) const;
+    wxString GetLineText(long lineNo) const;
+    int GetNumberOfLines() const;
+
+    bool IsModified() const;
+    bool IsEditable() const;
+
+    // If the return values from and to are the same, there is no selection.
+    void GetSelection(long* OUTPUT, long* OUTPUT) const;
+    wxString GetStringSelection();

 
     void Clear();
 
     void Clear();

+    void Replace(long from, long to, const wxString& value);
+    void Remove(long from, long to);
+
+    // load/save the controls contents from/to the file
+    bool LoadFile(const wxString& file);
+    bool SaveFile(const wxString& file = wxEmptyString);
+
+    // clears the dirty flag
+    void DiscardEdits();
+
+    // set the max number of characters which may be entered in a single line
+    // text control
+    void SetMaxLength(unsigned long len);
+
+    // writing text inserts it at the current position, appending always
+    // inserts it at the end
+    void WriteText(const wxString& text);
+    void AppendText(const wxString& text);
+
+    // text control under some platforms supports the text styles: these
+    // methods allow to apply the given text style to the given selection or to
+    // set/get the style which will be used for all appended text
+    bool SetStyle(long start, long end, const wxTextAttr& style);
+    bool SetDefaultStyle(const wxTextAttr& style);
+    const wxTextAttr& GetDefaultStyle() const;
+
+    // translate between the position (which is just an index in the text ctrl
+    // considering all its contents as a single strings) and (x, y) coordinates
+    // which represent column and line.
+    long XYToPosition(long x, long y) const;
+    bool PositionToXY(long pos, long *OUTPUT, long *OUTPUT) const;
+
+    void ShowPosition(long pos);
+
+    // Clipboard operations

     void Copy();
     void Cut();
     void Copy();
     void Cut();

-    void DiscardEdits();
-    long GetInsertionPoint();
-    long GetLastPosition();
-    int GetLineLength(long lineNo);
-    wxString GetLineText(long lineNo);
-    int GetNumberOfLines();
-    wxString GetValue();
-    bool IsModified();
-    bool LoadFile(const wxString& filename);

     void Paste();
     void Paste();

-    void PositionToXY(long pos, long *OUTPUT, long *OUTPUT);
-    void Remove(long from, long to);
-    void Replace(long from, long to, const wxString& value);
-    bool SaveFile(const wxString& filename);
-    void SetEditable(bool editable);
+
+    bool CanCopy() const;
+    bool CanCut() const;
+    bool CanPaste() const;
+
+    // Undo/redo
+    void Undo();
+    void Redo();
+
+    bool CanUndo() const;
+    bool CanRedo() const;
+
+    // Insertion point

     void SetInsertionPoint(long pos);
     void SetInsertionPointEnd();
     void SetInsertionPoint(long pos);
     void SetInsertionPointEnd();

+    long GetInsertionPoint() const;
+    long GetLastPosition() const;
+

     void SetSelection(long from, long to);
     void SetSelection(long from, long to);

-    void SetValue(const wxString& value);
-    void ShowPosition(long pos);
-    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();
-    void Undo();
-    void Redo();
+    void SelectAll();
+    void SetEditable(bool editable);

 
     %addmethods {
         void write(const wxString& text) {
 
     %addmethods {
         void write(const wxString& text) {

-            self->AppendText(text + '\n');
+            self->AppendText(text);
+        }
+    }
+
+    // TODO: replace this when the method is really added to wxTextCtrl
+    %addmethods {
+        wxString GetString(long from, long to) {
+            return self->GetValue().Mid(from, to-from);

         }
     }
 };
         }
     }
 };


@@ -439,19 +748,31 @@ public:
 class wxScrollBar : public wxControl {
 public:
     wxScrollBar(wxWindow* parent, wxWindowID id = -1,
 class wxScrollBar : public wxControl {
 public:
     wxScrollBar(wxWindow* parent, wxWindowID id = -1,

-                const wxPoint& pos = wxPyDefaultPosition,
-                const wxSize& size = wxPyDefaultSize,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxSB_HORIZONTAL,
+                const wxValidator& validator = wxDefaultValidator,
+                char* name = "scrollBar");
+    %name(wxPreScrollBar)wxScrollBar();
+
+    bool Create(wxWindow* parent, wxWindowID id = -1,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,

                 long style = wxSB_HORIZONTAL,
                 long style = wxSB_HORIZONTAL,

-                const wxValidator& validator = wxPyDefaultValidator,
+                const wxValidator& validator = wxDefaultValidator,

                 char* name = "scrollBar");
 
                 char* name = "scrollBar");
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreScrollBar:val._setOORInfo(val)"

 
     int GetRange();
     int GetPageSize();
     int GetThumbPosition();
     int GetThumbSize();
     %name(GetThumbLength) int GetThumbSize();  // to match the docs
 
     int GetRange();
     int GetPageSize();
     int GetThumbPosition();
     int GetThumbSize();
     %name(GetThumbLength) int GetThumbSize();  // to match the docs

+
+    bool IsVertical();
+

     void SetThumbPosition(int viewStart);
     void SetScrollbar(int position, int thumbSize,
                       int range,    int pageSize,
     void SetThumbPosition(int viewStart);
     void SetScrollbar(int position, int thumbSize,
                       int range,    int pageSize,


@@ -463,10 +784,20 @@ public:
 class wxSpinButton : public wxControl {
 public:
     wxSpinButton(wxWindow* parent, wxWindowID id = -1,
 class wxSpinButton : public wxControl {
 public:
     wxSpinButton(wxWindow* parent, wxWindowID id = -1,

-                 const wxPoint& pos = wxPyDefaultPosition,
-                 const wxSize& size = wxPyDefaultSize,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,

                  long style = wxSP_HORIZONTAL,
                  char* name = "spinButton");
                  long style = wxSP_HORIZONTAL,
                  char* name = "spinButton");

+    %name(wxPreSpinButton)wxSpinButton();
+
+    bool Create(wxWindow* parent, wxWindowID id = -1,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxSP_HORIZONTAL,
+                 char* name = "spinButton");
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreSpinButton:val._setOORInfo(val)"

 
     int GetMax();
     int GetMin();
 
     int GetMax();
     int GetMin();


@@ -481,14 +812,23 @@ class wxStaticBitmap : public wxControl {
 public:
     wxStaticBitmap(wxWindow* parent, wxWindowID id,
                    const wxBitmap& bitmap,
 public:
     wxStaticBitmap(wxWindow* parent, wxWindowID id,
                    const wxBitmap& bitmap,

-                   const wxPoint& pos = wxPyDefaultPosition,
-                   const wxSize& size = wxPyDefaultSize,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = 0,
+                   char* name = "staticBitmap");
+    %name(wxPreStaticBitmap)wxStaticBitmap();
+
+    bool Create(wxWindow* parent, wxWindowID id,
+                   const wxBitmap& bitmap,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,

                    long style = 0,
                    char* name = "staticBitmap");
 
                    long style = 0,
                    char* name = "staticBitmap");
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreStaticBitmap:val._setOORInfo(val)"

 
 

-    const wxBitmap& GetBitmap();
+    wxBitmap GetBitmap();

     void SetBitmap(const wxBitmap& bitmap);
     void SetIcon(const wxIcon& icon);
 };
     void SetBitmap(const wxBitmap& bitmap);
     void SetIcon(const wxIcon& icon);
 };


@@ -499,29 +839,52 @@ class wxRadioBox : public wxControl {
 public:
     wxRadioBox(wxWindow* parent, wxWindowID id,
                const wxString& label,
 public:
     wxRadioBox(wxWindow* parent, wxWindowID id,
                const wxString& label,

-               const wxPoint& point = wxPyDefaultPosition,
-               const wxSize& size = wxPyDefaultSize,
+               const wxPoint& point = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               int LCOUNT = 0, wxString* choices = NULL,
+               int majorDimension = 0,
+               long style = wxRA_HORIZONTAL,
+               const wxValidator& validator = wxDefaultValidator,
+               char* name = "radioBox");
+    %name(wxPreRadioBox)wxRadioBox();
+
+    bool Create(wxWindow* parent, wxWindowID id,
+               const wxString& label,
+               const wxPoint& point = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,

                int LCOUNT = 0, wxString* choices = NULL,
                int majorDimension = 0,
                long style = wxRA_HORIZONTAL,
                int LCOUNT = 0, wxString* choices = NULL,
                int majorDimension = 0,
                long style = wxRA_HORIZONTAL,

-               const wxValidator& validator = wxPyDefaultValidator,
+               const wxValidator& validator = wxDefaultValidator,

                char* name = "radioBox");
 
                char* name = "radioBox");
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreRadioBox:val._setOORInfo(val)"

 
     void Enable(bool enable);
     %name(EnableItem)void Enable(int n, bool enable);
     int FindString(const wxString& string);
 
 
     void Enable(bool enable);
     %name(EnableItem)void Enable(int n, bool enable);
     int FindString(const wxString& string);
 

-//***    wxString GetLabel();
-//***    void SetLabel(const wxString& label);
+    wxString GetString(int n);
+
+#ifdef __WXGTK__
+    %name(GetItemLabel)wxString GetLabel( int item );
+    %name(SetItemLabel)void SetLabel( int item, const wxString& label );
+#else
+    void SetString(int n, const wxString& label);
+    %pragma(python) addtoclass = "
+    GetItemLabel = GetString
+    SetItemLabel = SetString
+    "
+    int GetColumnCount();
+    int GetRowCount();
+#endif

 
 

-    %name(GetItemLabel)wxString GetLabel(int n);

     int GetSelection();
     int GetSelection();

-    wxString GetString(int n);

     wxString GetStringSelection();
     wxString GetStringSelection();

-    int Number();
-    %name(SetItemLabel)void SetLabel(int n, const wxString& label);
+    int GetCount();
+    %pragma(python) addtoclass = "Number = GetCount"
+

     void SetSelection(int n);
     void SetStringSelection(const wxString& string);
     void Show(bool show);
     void SetSelection(int n);
     void SetStringSelection(const wxString& string);
     void Show(bool show);


@@ -534,13 +897,23 @@ class wxRadioButton : public wxControl {
 public:
     wxRadioButton(wxWindow* parent, wxWindowID id,
                   const wxString& label,
 public:
     wxRadioButton(wxWindow* parent, wxWindowID id,
                   const wxString& label,

-                  const wxPoint& pos = wxPyDefaultPosition,
-                  const wxSize& size = wxPyDefaultSize,
+                  const wxPoint& pos = wxDefaultPosition,
+                  const wxSize& size = wxDefaultSize,
+                  long style = 0,
+                  const wxValidator& validator = wxDefaultValidator,
+                  char* name = "radioButton");
+    %name(wxPreRadioButton)wxRadioButton();
+
+    bool Create(wxWindow* parent, wxWindowID id,
+                  const wxString& label,
+                  const wxPoint& pos = wxDefaultPosition,
+                  const wxSize& size = wxDefaultSize,

                   long style = 0,
                   long style = 0,

-                  const wxValidator& validator = wxPyDefaultValidator,
+                  const wxValidator& validator = wxDefaultValidator,

                   char* name = "radioButton");
 
                   char* name = "radioButton");
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreRadioButton:val._setOORInfo(val)"

 
     bool GetValue();
     void SetValue(bool value);
 
     bool GetValue();
     void SetValue(bool value);


@@ -552,13 +925,23 @@ class wxSlider : public wxControl {
 public:
     wxSlider(wxWindow* parent, wxWindowID id,
              int value, int minValue, int maxValue,
 public:
     wxSlider(wxWindow* parent, wxWindowID id,
              int value, int minValue, int maxValue,

-             const wxPoint& point = wxPyDefaultPosition,
-             const wxSize& size = wxPyDefaultSize,
+             const wxPoint& point = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             long style = wxSL_HORIZONTAL,
+             const wxValidator& validator = wxDefaultValidator,
+             char* name = "slider");
+    %name(wxPreSlider)wxSlider();
+
+    bool Create(wxWindow* parent, wxWindowID id,
+             int value, int minValue, int maxValue,
+             const wxPoint& point = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,

              long style = wxSL_HORIZONTAL,
              long style = wxSL_HORIZONTAL,

-             const wxValidator& validator = wxPyDefaultValidator,
+             const wxValidator& validator = wxDefaultValidator,

              char* name = "slider");
 
              char* name = "slider");
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreSlider:val._setOORInfo(val)"

 
     void ClearSel();
     void ClearTicks();
 
     void ClearSel();
     void ClearTicks();


@@ -589,12 +972,24 @@ public:
     wxSpinCtrl(wxWindow *parent,
                wxWindowID id = -1,
                const char* value = "",
     wxSpinCtrl(wxWindow *parent,
                wxWindowID id = -1,
                const char* value = "",

-               const wxPoint& pos = wxPyDefaultPosition,
-               const wxSize& size = wxPyDefaultSize,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = wxSP_ARROW_KEYS,
+               int min = 0, int max = 100, int initial = 0,
+               const char* name = "wxSpinCtrl");
+    %name(wxPreSpinCtrl)wxSpinCtrl();
+
+    bool Create(wxWindow *parent,
+               wxWindowID id = -1,
+               const char* value = "",
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,

                long style = wxSP_ARROW_KEYS,
                int min = 0, int max = 100, int initial = 0,
                const char* name = "wxSpinCtrl");
 
                long style = wxSP_ARROW_KEYS,
                int min = 0, int max = 100, int initial = 0,
                const char* name = "wxSpinCtrl");
 

+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreSpinCtrl:val._setOORInfo(val)"

 
     int GetMax();
     int GetMin();
 
     int GetMax();
     int GetMin();


@@ -607,5 +1002,43 @@ public:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

+#ifndef __WXMAC__
+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");
+    %name(wxPreToggleButton)wxToggleButton();
+
+    bool Create(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");
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreToggleButton:val._setOORInfo(val)"
+
+    void SetValue(bool value);
+    bool GetValue() const ;
+    void SetLabel(const wxString& label);
+
+};
+
+#endif
+//----------------------------------------------------------------------
+//----------------------------------------------------------------------
+//----------------------------------------------------------------------
+