Revised #ifndef WX_PRECOMP headers, added missing #include wx/wxcrtvararg.h

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

diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp
index cf053fb611cdc72a087f2e5dcf5f40d5da5caf67..6685fda3cf9e13e653e918a904832e1f22dcc37f 100644 (file)
--- a/src/common/choiccmn.cpp
+++ b/src/common/choiccmn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        common/choiccmn.cpp
+// Name:        src/common/choiccmn.cpp
 // Purpose:     common (to all ports) wxChoice functions
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -26,11 +26,12 @@
 
 #if wxUSE_CHOICE
 
+#include "wx/choice.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/choice.h"
 #endif
 
-WXDLLIMPEXP_DATA_CORE(const wxChar) wxChoiceNameStr[] = wxT("choice");
+const char wxChoiceNameStr[] = "choice";
 
 // ============================================================================
 // implementation
@@ -52,4 +53,3 @@ void wxChoiceBase::Command(wxCommandEvent& event)
 }
 
 #endif // wxUSE_CHOICE
-