Fixes for Unicode build.

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

diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index aa7950a3e13d339dbdd578d6e0e97caa627c267c..fc2b142832bb970a771a6147a98755865ea37670 100644 (file)
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -5,14 +5,14 @@
 // Modified by:
 // Created:     10.09.00
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     10.09.00
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBOX_H_BASE_
 #define _WX_RADIOBOX_H_BASE_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBOX_H_BASE_
 #define _WX_RADIOBOX_H_BASE_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "radioboxbase.h"
 #endif
 
     #pragma interface "radioboxbase.h"
 #endif
 


@@ -87,11 +87,11 @@ public:
     int GetNextItem(int item, wxDirection dir, long style) const;
 
     // for compatibility only, don't use these methods in new code!
     int GetNextItem(int item, wxDirection dir, long style) const;
 
     // for compatibility only, don't use these methods in new code!

-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2_2

     int Number() const { return GetCount(); }
     wxString GetLabel(int n) const { return GetString(n); }
     void SetLabel(int n, const wxString& label) { SetString(n, label); }
     int Number() const { return GetCount(); }
     wxString GetLabel(int n) const { return GetString(n); }
     void SetLabel(int n, const wxString& label) { SetString(n, label); }

-#endif // WXWIN_COMPATIBILITY_2
+#endif // WXWIN_COMPATIBILITY_2_2

 };
 
 #if defined(__WXUNIVERSAL__)
 };
 
 #if defined(__WXUNIVERSAL__)


@@ -102,14 +102,12 @@ public:
     #include "wx/motif/radiobox.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/radiobox.h"
     #include "wx/motif/radiobox.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/radiobox.h"

-#elif defined(__WXQT__)
-    #include "wx/qt/radiobox.h"

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

+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/radiobox.h"

 #elif defined(__WXPM__)
     #include "wx/os2/radiobox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/radiobox.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/radiobox.h"

 #endif
 
 #endif // wxUSE_RADIOBOX
 #endif
 
 #endif // wxUSE_RADIOBOX