X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e711d5c093dcc758e3f1670caf845612ea9fa92..dd1c16314e09a49b6afdc15fadf001acc75856bd:/include/wx/tglbtn.h diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h index e0d53e661e..7ac6ec9840 100644 --- a/include/wx/tglbtn.h +++ b/include/wx/tglbtn.h @@ -7,7 +7,7 @@ // Created: 08.02.01 // RCS-ID: $Id$ // Copyright: (c) 2000 Johnny C. Norris II -// License: Rocketeer license +// License: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_TOGGLEBUTTON_H_BASE_ @@ -24,22 +24,25 @@ BEGIN_DECLARE_EVENT_TYPES() DECLARE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, 19) END_DECLARE_EVENT_TYPES() -#define EVT_TOGGLEBUTTON(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ), +#define EVT_TOGGLEBUTTON(id, fn) \ + wx__DECLARE_EVT1(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, id, wxCommandEventHandler(fn)) -#if defined(__WXMSW__) +#if defined(__WXUNIVERSAL__) + #include "wx/univ/tglbtn.h" +#elif defined(__WXMSW__) #include "wx/msw/tglbtn.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/tglbtn.h" -/* +#elif defined(__WXGTK__) + #include "wx/gtk1/tglbtn.h" # elif defined(__WXMOTIF__) -# include "wx/motif/tglbtn.h" -# elif defined(__WXMAC__) -# include "wx/mac/tglbtn.h" -# elif defined(__WXPM__) -# include "wx/os2/tglbtn.h" -# elif defined(__WXSTUBS__) -# include "wx/stubs/tglbtn.h" -*/ + #include "wx/motif/tglbtn.h" +#elif defined(__WXMAC__) + #include "wx/mac/tglbtn.h" +#elif defined(__WXPALMOS__) + #include "wx/palmos/tglbtn.h" +#elif defined(__WXPM__) + #include "wx/os2/tglbtn.h" #endif #endif // wxUSE_TOGGLEBTN