Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / palmos / tglbtn.cpp

diff --git a/src/palmos/tglbtn.cpp b/src/palmos/tglbtn.cpp
index 7412efaf5c60a461b21e5fff87c956c24ef03408..856b13d77ebfffb098c5701b1ceef69e8268cfed 100644 (file)
--- a/src/palmos/tglbtn.cpp
+++ b/src/palmos/tglbtn.cpp
@@ -26,6 +26,8 @@
 
 #if wxUSE_TOGGLEBTN
 
+#include "wx/tglbtn.h"
+
 #ifndef WX_PRECOMP
     #include "wx/button.h"
     #include "wx/brush.h"
@@ -35,14 +37,14 @@
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
-#include "wx/tglbtn.h"
+#include <Control.h>
 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
+wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
 
 // ============================================================================
 // implementation
@@ -99,4 +101,3 @@ void wxToggleButton::Command(wxCommandEvent & event)
 }
 
 #endif // wxUSE_TOGGLEBTN
-