X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/322d45dd738f8fbbc6cb17379a28c308c6e3bd72..7169360153f35fe579c7e72fd95a1dbbb2eff043:/src/os2/tglbtn.cpp

diff --git a/src/os2/tglbtn.cpp b/src/os2/tglbtn.cpp
index a262a3a185..86e5dc030c 100644
--- a/src/os2/tglbtn.cpp
+++ b/src/os2/tglbtn.cpp
@@ -1,14 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/tglbtn.cpp
+// Name:        src/os2/tglbtn.cpp
 // Purpose:     Definition of the wxToggleButton class, which implements a
 //              toggle button under wxMSW.
 // Author: John Norris, minor changes by Axel Schlueter
 // and William Gallafent.
 // Modified by:
 // Created:     08.02.01
-// RCS-ID:      $Id$
 // Copyright:   (c) 2000 Johnny C. Norris II
-// License:     wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -25,10 +24,10 @@
     #pragma hdrstop
 #endif
 
-#include "wx/tglbtn.h"
-
 #if wxUSE_TOGGLEBTN
 
+#include "wx/tglbtn.h"
+
 #ifndef WX_PRECOMP
     #include "wx/button.h"
     #include "wx/brush.h"
@@ -38,14 +37,12 @@
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
-#include "wx/msw/private.h"
-
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
+wxDEFINE_EVENT( wxEVT_TOGGLEBUTTON, wxCommandEvent );
 
 #define BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cy) (11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)/10)
 
@@ -59,7 +56,7 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
 
 bool wxToggleButton::OS2Command(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
 {
-   wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
+   wxCommandEvent event(wxEVT_TOGGLEBUTTON, m_windowId);
    event.SetInt(GetValue());
    event.SetEventObject(this);
    ProcessCommand(event);
@@ -154,4 +151,3 @@ void wxToggleButton::Command(wxCommandEvent & event)
 }
 
 #endif // wxUSE_TOGGLEBTN
-