X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85284ca4b226d9a1ab6bed26c5eaa480543649d5..f5fac4471b361f54ae6a09f6047ae4dbe30fcb86:/include/wx/osx/button.h?ds=sidebyside diff --git a/include/wx/osx/button.h b/include/wx/osx/button.h index 8a1a8e06e6..602644fe2c 100644 --- a/include/wx/osx/button.h +++ b/include/wx/osx/button.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: button.h +// Name: wx/osx/button.h // Purpose: wxButton class // Author: Stefan Csomor // Modified by: @@ -9,16 +9,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_BUTTON_H_ -#define _WX_BUTTON_H_ +#ifndef _WX_OSX_BUTTON_H_ +#define _WX_OSX_BUTTON_H_ #include "wx/control.h" #include "wx/gdicmn.h" -WXDLLIMPEXP_DATA_CORE(extern const char) wxButtonNameStr[]; - // Pushbutton -class WXDLLIMPEXP_CORE wxButton: public wxButtonBase +class WXDLLIMPEXP_CORE wxButton : public wxButtonBase { public: wxButton() {} @@ -43,23 +41,20 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - static wxSize GetDefaultSize(); - virtual void SetLabel(const wxString& label); virtual wxWindow *SetDefault(); virtual void Command(wxCommandEvent& event); // osx specific event handling common for all osx-ports - + virtual bool OSXHandleClicked( double timestampsec ); protected: - virtual wxSize DoGetBestSize() const ; - DECLARE_DYNAMIC_CLASS(wxButton) }; -class WXDLLIMPEXP_CORE wxDisclosureTriangle: public wxControl +// OS X specific class, not part of public wx API +class WXDLLIMPEXP_CORE wxDisclosureTriangle : public wxControl { public: wxDisclosureTriangle(wxWindow *parent, @@ -67,7 +62,7 @@ public: const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = 0, + long style = wxBORDER_NONE, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr) { @@ -79,7 +74,7 @@ public: const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = 0, + long style = wxBORDER_NONE, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); @@ -87,13 +82,11 @@ public: bool IsOpen() const; // osx specific event handling common for all osx-ports - + virtual bool OSXHandleClicked( double timestampsec ); protected: virtual wxSize DoGetBestSize() const ; - }; -#endif - // _WX_BUTTON_H_ +#endif // _WX_OSX_BUTTON_H_