Warning fix for wxOS2 night build.

[wxWidgets.git] / include / wx / tglbtn.h

diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h
index 53fa4926de62a143911df3692072a904242c5115..2972d5f04a4cde613b95749a5ddf72a521a38a5a 100644 (file)
--- 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
 // 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_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOGGLEBUTTON_H_BASE_


@@ -29,18 +29,18 @@ END_DECLARE_EVENT_TYPES()
 
 #if defined(__WXMSW__)
     #include "wx/msw/tglbtn.h"
 
 #if defined(__WXMSW__)
     #include "wx/msw/tglbtn.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/tglbtn.h"
     #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(__WXPALMOS__)
     #include "wx/palmos/tglbtn.h"
 # elif defined(__WXMOTIF__)
     #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"
-*/
+#elif defined(__WXPM__)
+    #include "wx/os2/tglbtn.h"

 #endif
 
 #endif // wxUSE_TOGGLEBTN
 #endif
 
 #endif // wxUSE_TOGGLEBTN