made deprecated erase() overload inline

[wxWidgets.git] / include / wx / mac / carbon / button.h

diff --git a/include/wx/mac/carbon/button.h b/include/wx/mac/carbon/button.h
index 126e3ad6c5f38a143fdb1eaf95c5fb03eb93886b..d43300cb845f9b1ee7d4cad1f6d8994843d020a1 100644 (file)
--- a/include/wx/mac/carbon/button.h
+++ b/include/wx/mac/carbon/button.h
@@ -15,7 +15,7 @@
 #include "wx/control.h"
 #include "wx/gdicmn.h"
 
-WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[];
+WXDLLEXPORT_DATA(extern const char) wxButtonNameStr[];
 
 // Pushbutton
 class WXDLLEXPORT wxButton: public wxButtonBase
@@ -55,5 +55,39 @@ protected:
     DECLARE_DYNAMIC_CLASS(wxButton)
 };
 
+class WXDLLEXPORT wxDisclosureTriangle: public wxControl
+{
+public:
+    wxDisclosureTriangle(wxWindow *parent,
+             wxWindowID id,
+             const wxString& label = wxEmptyString,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             long style = 0,
+             const wxValidator& validator = wxDefaultValidator,
+             const wxString& name = wxButtonNameStr)
+    {
+        Create(parent, id, label, pos, size, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& label = wxEmptyString,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxButtonNameStr);
+
+    void SetOpen( bool open );
+    bool IsOpen() const;
+
+    virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
+
+protected:
+    virtual wxSize DoGetBestSize() const ;
+    
+};
+
 #endif
     // _WX_BUTTON_H_