corrected signed/unsigned comparison warning

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

diff --git a/src/common/strvararg.cpp b/src/common/strvararg.cpp
index e3435e67133fb9c69c72199bcc53051e6a4e8150..5e7955dd1ece151471fa6614bb6dadb744031a04 100644 (file)
--- a/src/common/strvararg.cpp
+++ b/src/common/strvararg.cpp
@@ -32,14 +32,14 @@
 // implementation
 // ============================================================================
 
-const wxArgNativeCharType *wxArgNormalizer<const wxCStrData&>::get() const
+const wxStringCharType *wxArgNormalizer<const wxCStrData&>::get() const
 {
     return m_value;
 }
 
-const wxArgNativeCharType *wxArgNormalizer<const wxString&>::get() const
+const wxStringCharType *wxArgNormalizer<const wxString&>::get() const
 {
-    return m_value.c_str();
+    return m_value.wx_str();
 }
 
 #if wxUSE_UNICODE_WCHAR
@@ -77,3 +77,16 @@ const char *wxArgNormalizer<const wchar_t*>::get() const
 }
 
 #endif // wxUSE_UNICODE_WCHAR / !wxUSE_UNICODE_WCHAR && wxUSE_WCHAR_T
+
+// FIXME-UTF8: move this to the header once it's possible to include buffer.h
+//             without including wxcrt.h
+
+wxArgNormalizer<wxCharBuffer>::wxArgNormalizer(const wxCharBuffer& buf)
+    : wxArgNormalizer<const char*>(buf.data())
+{
+}
+
+wxArgNormalizer<wxWCharBuffer>::wxArgNormalizer(const wxWCharBuffer& buf)
+    : wxArgNormalizer<const wchar_t*>(buf.data())
+{
+}