Fix file paths in wxFileSystemWatcherEvent under OS X.

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

diff --git a/src/os2/tglbtn.cpp b/src/os2/tglbtn.cpp
index a262a3a185f2d2cb6fd01fedac2d6e4df6a45ff8..630f55d56096c4f2509537e7a412a9fed0e2aa9f 100644 (file)
--- a/src/os2/tglbtn.cpp
+++ b/src/os2/tglbtn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // Purpose:     Definition of the wxToggleButton class, which implements a
 //              toggle button under wxMSW.
 // Author: John Norris, minor changes by Axel Schlueter


@@ -8,7 +8,7 @@
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Johnny C. Norris II
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Johnny C. Norris II

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -25,10 +25,10 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/tglbtn.h"
-

 #if wxUSE_TOGGLEBTN
 
 #if wxUSE_TOGGLEBTN
 

+#include "wx/tglbtn.h"
+

 #ifndef WX_PRECOMP
     #include "wx/button.h"
     #include "wx/brush.h"
 #ifndef WX_PRECOMP
     #include "wx/button.h"
     #include "wx/brush.h"


@@ -38,14 +38,12 @@
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
     #include "wx/log.h"
 #endif // WX_PRECOMP
 

-#include "wx/msw/private.h"
-

 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)

-DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
+wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );

 
 #define BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cy) (11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)/10)
 
 
 #define BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cy) (11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)/10)
 


@@ -154,4 +152,3 @@ void wxToggleButton::Command(wxCommandEvent & event)
 }
 
 #endif // wxUSE_TOGGLEBTN
 }
 
 #endif // wxUSE_TOGGLEBTN

-