reworked font handling for osx

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

diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h
index d555d50e0eb5e2c9fb0d838862850bf22d6f7bb7..44e24d0234e95f73ab46aeb8fc7e2d8322def845 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 WXDLLIMPEXP_DATA_CORE(const char) wxRadioButtonNameStr[];

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


@@ -39,12 +41,18 @@ WXDLLEXPORT_DATA(extern 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__)
 #elif defined(__WXMAC__)

-    #include "wx/mac/radiobut.h"
+    #include "wx/osx/radiobut.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/radiobut.h"

 #elif defined(__WXPM__)
     #include "wx/os2/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