wx.App

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

diff --git a/wxPython/src/_tglbtn.i b/wxPython/src/_tglbtn.i
index b0eec03e23ff0f85d2c43fe3fa0e93e2c99afea7..a0a755e0de6ea06286f4472de5043daefc669a88 100644 (file)
--- a/wxPython/src/_tglbtn.i
+++ b/wxPython/src/_tglbtn.i
@@ -15,17 +15,14 @@
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-%{
-    wxChar* wxToggleButtonNameStr = _T("wxToggleButton");
-    DECLARE_DEF_STRING(ToggleButtonNameStr);
-%}
+MAKE_CONST_WXSTRING2(ToggleButtonNameStr, _T("wxToggleButton"));

 
 //---------------------------------------------------------------------------
 %newgroup
 
 
 %{
 
 //---------------------------------------------------------------------------
 %newgroup
 
 
 %{

-#ifdef __WXMAC__
+#if defined(__WXMAC__) || defined(__WXX11__)

 // implement dummy classes and such for wxMac
 
 #define wxEVT_COMMAND_TOGGLEBUTTON_CLICKED 0
 // implement dummy classes and such for wxMac
 
 #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&)
     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
 %}


@@ -69,7 +66,7 @@ public:
                    const wxString& name = wxPyToggleButtonNameStr);
     %name(PreToggleButton)wxToggleButton();
 
                    const wxString& name = wxPyToggleButtonNameStr);
     %name(PreToggleButton)wxToggleButton();
 

-#ifndef __WXMAC__
+#if defined(__WXMSW__) || defined(__WXGTK__)

     bool Create(wxWindow *parent,
                    wxWindowID id,
                    const wxString& label,
     bool Create(wxWindow *parent,
                    wxWindowID id,
                    const wxString& label,