Allow translated 'Space' in menu accelerators (perhaps more entries should allow...

[wxWidgets.git] / src / richtext / richtextxml.cpp

diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp
index 516fb41a28433eb3a3eb8c69fb3283114f7c268a..cec140e5c4a99a167f95ee0a7474412f3ca8b7f7 100644 (file)
--- a/src/richtext/richtextxml.cpp
+++ b/src/richtext/richtextxml.cpp
@@ -257,6 +257,15 @@ wxString wxRichTextXMLHandler::GetText(wxXmlNode *node, const wxString& param, b
     return str1;
 }
 
     return str1;
 }
 

+// For use with earlier versions of wxWidgets
+#ifndef WXUNUSED_IN_UNICODE
+#if wxUSE_UNICODE
+#define WXUNUSED_IN_UNICODE(x) WXUNUSED(x)
+#else
+#define WXUNUSED_IN_UNICODE(x) x
+#endif
+#endif
+

 // write string to output:
 inline static void OutputString(wxOutputStream& stream, const wxString& str,
                                 wxMBConv *WXUNUSED_IN_UNICODE(convMem) = NULL, wxMBConv *convFile = NULL)
 // write string to output:
 inline static void OutputString(wxOutputStream& stream, const wxString& str,
                                 wxMBConv *WXUNUSED_IN_UNICODE(convMem) = NULL, wxMBConv *convFile = NULL)


@@ -330,6 +339,7 @@ static wxOutputStream& operator <<(wxOutputStream& stream, const wxString& s)
     return stream;
 }
 
     return stream;
 }
 

+#if 0

 static wxOutputStream& operator <<(wxOutputStream& stream, long l)
 {
     wxString str;
 static wxOutputStream& operator <<(wxOutputStream& stream, long l)
 {
     wxString str;


@@ -343,6 +353,7 @@ static wxOutputStream& operator <<(wxOutputStream& stream, const char c)
     str.Printf(wxT("%c"), c);
     return stream << str;
 }
     str.Printf(wxT("%c"), c);
     return stream << str;
 }

+#endif

 
 // Convert a colour to a 6-digit hex string
 static wxString ColourToHexString(const wxColour& col)
 
 // Convert a colour to a 6-digit hex string
 static wxString ColourToHexString(const wxColour& col)