Reverted to old method names/signatures for wx.DC, updated lib and

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

diff --git a/wxPython/src/_tglbtn.i b/wxPython/src/_tglbtn.i
index b0eec03e23ff0f85d2c43fe3fa0e93e2c99afea7..e2cf914b5823153b30c62fa54dbf5fe9a3e78540 100644 (file)
--- a/wxPython/src/_tglbtn.i
+++ b/wxPython/src/_tglbtn.i
@@ -15,18 +15,15 @@
 
 //---------------------------------------------------------------------------
 
-%{
-    wxChar* wxToggleButtonNameStr = _T("wxToggleButton");
-    DECLARE_DEF_STRING(ToggleButtonNameStr);
-%}
+MAKE_CONST_WXSTRING2(ToggleButtonNameStr, _T("wxToggleButton"));
 
 //---------------------------------------------------------------------------
 %newgroup
 
 
 %{
-#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
     
@@ -36,10 +33,10 @@ public:
     wxToggleButton(wxWindow *, wxWindowID, const wxString&,
                    const wxPoint&, const wxSize&, long,
                    const wxValidator&, const wxString&)
-        { PyErr_SetNone(PyExc_NotImplementedError); }
+        { wxPyRaiseNotImplemented(); }
     
     wxToggleButton()
-        { PyErr_SetNone(PyExc_NotImplementedError); }
+        { wxPyRaiseNotImplemented(); }
 };
 #endif
 %}
@@ -56,8 +53,8 @@ public:
 class wxToggleButton : public wxControl
 {
 public:
-    %addtofunc wxToggleButton         "self._setOORInfo(self)"
-    %addtofunc wxToggleButton()       ""
+    %pythonAppend wxToggleButton         "self._setOORInfo(self)"
+    %pythonAppend wxToggleButton()       ""
 
     wxToggleButton(wxWindow *parent,
                    wxWindowID id,
@@ -69,7 +66,6 @@ public:
                    const wxString& name = wxPyToggleButtonNameStr);
     %name(PreToggleButton)wxToggleButton();
 
-#ifndef __WXMAC__
     bool Create(wxWindow *parent,
                    wxWindowID id,
                    const wxString& label,
@@ -82,7 +78,6 @@ public:
     void SetValue(bool value);
     bool GetValue() const ;
     void SetLabel(const wxString& label);
-#endif
 };
 
 //---------------------------------------------------------------------------