ignore warning 4535 for VC8 too as it still seems to be harmless

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

diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h
index a2daea534180c5b28367e86a373e307e7e3150c3..2df27e03f7202d17836556cc13ea7687f9388a3f 100644 (file)
--- a/include/wx/radiobut.h
+++ b/include/wx/radiobut.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     07.09.00
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     07.09.00
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWidgets team
+// Copyright:   (c) Vadim Zeitlin

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -33,7 +33,7 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-extern WXDLLEXPORT_DATA(const wxChar*) wxRadioButtonNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxRadioButtonNameStr[];

 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/radiobut.h"
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/radiobut.h"


@@ -41,8 +41,10 @@ extern WXDLLEXPORT_DATA(const wxChar*) wxRadioButtonNameStr;
     #include "wx/msw/radiobut.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/radiobut.h"
     #include "wx/msw/radiobut.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/radiobut.h"

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

     #include "wx/gtk/radiobut.h"
     #include "wx/gtk/radiobut.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/radiobut.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/radiobut.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
     #include "wx/mac/radiobut.h"
 #elif defined(__WXCOCOA__)