Avoid assert on wxMac

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

diff --git a/wxPython/src/_tglbtn.i b/wxPython/src/_tglbtn.i
index 1d736f9c38cac15593454e4c5cb315fe34a1cb9a..05fa6455f30ba1e4714fae30d8150755012d6d2d 100644 (file)
--- a/wxPython/src/_tglbtn.i
+++ b/wxPython/src/_tglbtn.i
@@ -22,8 +22,8 @@ MAKE_CONST_WXSTRING2(ToggleButtonNameStr, _T("wxToggleButton"));
 
 
 %{
 
 
 %{

-#ifdef __WXMAC__
-// implement dummy classes and such for wxMac
+#if !wxUSE_TOGGLEBTN
+// implement dummy items for platforms that don't have this class

 
 #define wxEVT_COMMAND_TOGGLEBUTTON_CLICKED 0
     
 
 #define wxEVT_COMMAND_TOGGLEBUTTON_CLICKED 0
     


@@ -33,10 +33,10 @@ public:
     wxToggleButton(wxWindow *, wxWindowID, const wxString&,
                    const wxPoint&, const wxSize&, long,
                    const wxValidator&, const wxString&)
     wxToggleButton(wxWindow *, wxWindowID, const wxString&,
                    const wxPoint&, const wxSize&, long,
                    const wxValidator&, const wxString&)

-        { PyErr_SetNone(PyExc_NotImplementedError); }
+        { wxPyRaiseNotImplemented(); }

     
     wxToggleButton()
     
     wxToggleButton()

-        { PyErr_SetNone(PyExc_NotImplementedError); }
+        { wxPyRaiseNotImplemented(); }

 };
 #endif
 %}
 };
 #endif
 %}


@@ -50,26 +50,27 @@ public:
 }
 
 
 }
 
 

+MustHaveApp(wxToggleButton);
+

 class wxToggleButton : public wxControl
 {
 public:
 class wxToggleButton : public wxControl
 {
 public:

-    %addtofunc wxToggleButton         "self._setOORInfo(self)"
-    %addtofunc wxToggleButton()       ""
+    %pythonAppend wxToggleButton         "self._setOORInfo(self)"
+    %pythonAppend wxToggleButton()       ""

 
     wxToggleButton(wxWindow *parent,
 
     wxToggleButton(wxWindow *parent,

-                   wxWindowID id,
-                   const wxString& label,
+                   wxWindowID id=-1,
+                   const wxString& label = wxPyEmptyString,

                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxPyToggleButtonNameStr);
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxPyToggleButtonNameStr);

-    %name(PreToggleButton)wxToggleButton();
+    %RenameCtor(PreToggleButton, wxToggleButton());

 
 

-#ifndef __WXMAC__

     bool Create(wxWindow *parent,
     bool Create(wxWindow *parent,

-                   wxWindowID id,
-                   const wxString& label,
+                   wxWindowID id=-1,
+                   const wxString& label = wxPyEmptyString,

                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,


@@ -79,7 +80,11 @@ public:
     void SetValue(bool value);
     bool GetValue() const ;
     void SetLabel(const wxString& label);
     void SetValue(bool value);
     bool GetValue() const ;
     void SetLabel(const wxString& label);

-#endif
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
+    %property(Value, GetValue, SetValue, doc="See `GetValue` and `SetValue`");

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