Spelling corrections

[wxWidgets.git] / src / common / choiccmn.cpp

diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp
index 2e0e59eb669702071af260ac9ff1c83edc1e195f..a4be5ca35c5e938255881f8a10ac513b06c8d027 100644 (file)
--- a/src/common/choiccmn.cpp
+++ b/src/common/choiccmn.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     26.07.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "choicebase.h"
 #endif
 
@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_CHOICE
+
 #ifndef WX_PRECOMP
     #include "wx/choice.h"
 #endif
@@ -36,6 +38,11 @@
 // implementation
 // ============================================================================
 
+wxChoiceBase::~wxChoiceBase()
+{
+    // this destructor is required for Darwin
+}
+
 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------
@@ -43,12 +50,12 @@
 bool wxChoiceBase::SetStringSelection(const wxString& s)
 {
     int sel = FindString(s);
-    wxCHECK_MSG( sel != -1, FALSE,
+    wxCHECK_MSG( sel != -1, false,
                  wxT("invalid string in wxChoice::SetStringSelection") );
 
     Select(sel);
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -60,3 +67,6 @@ void wxChoiceBase::Command(wxCommandEvent& event)
     SetSelection(event.m_commandInt);
     (void)ProcessEvent(event);
 }
+
+#endif // wxUSE_CHOICE
+