Compile fix (VC++ 6 doesn't like wxString::Format with only 1 arg: gives several...

[wxWidgets.git] / include / wx / msw / ole / oleutils.h

diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h
index 50286a3c404c52abd3261b0f59cd4aae1a0a4805..b70a76ade8d0948b158a3f4da034426ed110de5c 100644 (file)
--- a/include/wx/msw/ole/oleutils.h
+++ b/include/wx/msw/ole/oleutils.h
@@ -228,17 +228,19 @@ private:
     OLECHAR *m_wzBuf;     // actual string
 };
 
     OLECHAR *m_wzBuf;     // actual string
 };
 

+#if wxUSE_VARIANT

 // Convert variants
 // Convert variants

-class WXDLLIMPEXP_BASE wxVariant;
+class WXDLLIMPEXP_FWD_BASE wxVariant;

 
 

-bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant) ;
-bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant) ;
+WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant);
+WXDLLEXPORT bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant);
+#endif // wxUSE_VARIANT

 
 // Convert string to Unicode
 
 // Convert string to Unicode

-BSTR wxConvertStringToOle(const wxString& str);
+WXDLLEXPORT BSTR wxConvertStringToOle(const wxString& str);

 
 // Convert string from BSTR to wxString
 
 // Convert string from BSTR to wxString

-wxString wxConvertStringFromOle(BSTR bStr);
+WXDLLEXPORT wxString wxConvertStringFromOle(BSTR bStr);

 
 #else // !wxUSE_OLE
 
 
 #else // !wxUSE_OLE