Applied patch [ 1381895 ] remove circular include dependendcy in wxchar.h

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

diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h
index 19ff88091b5948c2eb4ec74afc162287a365a464..26e02b85a31a7fb9a4654e4303ed0af5c5dc0e7a 100644 (file)
--- a/include/wx/radiobut.h
+++ b/include/wx/radiobut.h
@@ -5,18 +5,20 @@
 // Modified by:
 // Created:     07.09.00
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     07.09.00
 // RCS-ID:      $Id$

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

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBUT_H_BASE_
 #define _WX_RADIOBUT_H_BASE_
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBUT_H_BASE_
 #define _WX_RADIOBUT_H_BASE_
 

+#include "wx/defs.h"
+

 #if wxUSE_RADIOBTN
 
 /*
    There is no wxRadioButtonBase class as wxRadioButton interface is the same
 #if wxUSE_RADIOBTN
 
 /*
    There is no wxRadioButtonBase class as wxRadioButton interface is the same

-   as of wxCheckBox(Base), but under some platforms wxRadioButton really
+   as wxCheckBox(Base), but under some platforms wxRadioButton really

    derives from wxCheckBox and on the others it doesn't.
 
    The pseudo-declaration of wxRadioButtonBase would look like this:
    derives from wxCheckBox and on the others it doesn't.
 
    The pseudo-declaration of wxRadioButtonBase would look like this:


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

-WXDLLEXPORT_DATA(extern 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"


@@ -47,6 +49,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxRadioButtonNameStr;
     #include "wx/cocoa/radiobut.h"
 #elif defined(__WXPM__)
     #include "wx/os2/radiobut.h"
     #include "wx/cocoa/radiobut.h"
 #elif defined(__WXPM__)
     #include "wx/os2/radiobut.h"

+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/radiobut.h"

 #endif
 
 #endif // wxUSE_RADIOBTN
 #endif
 
 #endif // wxUSE_RADIOBTN