Allow for Cmd-click on wxMac

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

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

-#if defined(__WXMAC__) || defined(__WXX11__)
-// 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
     


@@ -50,15 +50,17 @@ 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 wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,


@@ -66,10 +68,9 @@ public:
                    const wxString& name = wxPyToggleButtonNameStr);
     %name(PreToggleButton)wxToggleButton();
 
                    const wxString& name = wxPyToggleButtonNameStr);
     %name(PreToggleButton)wxToggleButton();
 

-#if !defined(__WXMAC__) && !defined(__WXX11__)

     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,9 @@ 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);

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