X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1408104d04fdea106c8ec288866c4143078ae71b..b77d96500ac802c84e0416e715c907e34d335632:/include/wx/os2/button.h diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h index a7dee7609e..ed2c8a8f40 100644 --- a/include/wx/os2/button.h +++ b/include/wx/os2/button.h @@ -1,23 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// // Name: button.h // Purpose: wxButton class -// Author: AUTHOR +// Author: David Webster // Modified by: -// Created: ??/??/98 +// Created: 10/13/99 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) David Webster +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_BUTTON_H_ #define _WX_BUTTON_H_ -#ifdef __GNUG__ -#pragma interface "button.h" -#endif - #include "wx/control.h" -#include "wx/gdicmn.h" WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr; @@ -30,7 +25,9 @@ class WXDLLEXPORT wxButton: public wxControl inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, +#if wxUSE_VALIDATORS const wxValidator& validator = wxDefaultValidator, +#endif const wxString& name = wxButtonNameStr) { Create(parent, id, label, pos, size, style, validator, name); @@ -39,19 +36,30 @@ class WXDLLEXPORT wxButton: public wxControl bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, +#if wxUSE_VALIDATORS const wxValidator& validator = wxDefaultValidator, +#endif const wxString& name = wxButtonNameStr); virtual ~wxButton(); - virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); virtual void SetDefault(); - virtual void SetLabel(const wxString& label); - virtual wxString GetLabel() const ; static wxSize GetDefaultSize(); virtual void Command(wxCommandEvent& event); + virtual bool OS2Command(WXUINT param, WXWORD id); + virtual WXHBRUSH OnCtlColor(WXHDC pDC, + WXHWND pWnd, + WXUINT nCtlColor, + WXUINT message, + WXWPARAM wParam, + WXLPARAM lParam); +protected: + // send a notification event, return TRUE if processed + bool SendClickEvent(); + + virtual wxSize DoGetBestSize() const; }; #endif