X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10ff9c616e00e4074dfdc2ac9e354605cc129c22..aaedb44c5e7169db22d32e8a335936e3213da33a:/include/wx/tglbtn.h

diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h
index 228cffdd31..d7546f1f44 100644
--- a/include/wx/tglbtn.h
+++ b/include/wx/tglbtn.h
@@ -20,15 +20,13 @@
 #include "wx/event.h"
 #include "wx/control.h"     // base class
 
-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, 19)
-END_DECLARE_EVENT_TYPES()
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
 
 // ----------------------------------------------------------------------------
 // wxToggleButtonBase
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxToggleButtonBase : public wxControl
+class WXDLLIMPEXP_CORE wxToggleButtonBase : public wxControl
 {
 public:
     wxToggleButtonBase() { }
@@ -67,7 +65,7 @@ protected:
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
-    DECLARE_NO_COPY_CLASS(wxToggleButtonBase)
+    wxDECLARE_NO_COPY_CLASS(wxToggleButtonBase);
 };
 
 
@@ -85,7 +83,7 @@ protected:
 # elif defined(__WXMOTIF__)
     #include "wx/motif/tglbtn.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/tglbtn.h"
+    #include "wx/osx/tglbtn.h"
 #elif defined(__WXPALMOS__)
     #include "wx/palmos/tglbtn.h"
 #elif defined(__WXPM__)