In RotateScreen destructor, do not leak subscreen surfaces.

[ccbs] / bigscreen / widestring.cpp

diff --git a/bigscreen/widestring.cpp b/bigscreen/widestring.cpp
index 52b7f559e48acf406ecb58e9bb008369b4ccd0a3..241183650819a700b9bc36e48c49c5d16c561412 100644 (file)
--- a/bigscreen/widestring.cpp
+++ b/bigscreen/widestring.cpp
@@ -1,3 +1,5 @@
+#include <stdlib.h>
+#include <cstring>
 #include <iconv.h>
 #include <endian.h>
 #include <exception>
@@ -7,11 +9,25 @@
 static iconv_t ucs4_iconv;
 static bool iconv_initialized = false;
 
+widestring::widestring()
+{
+}
+
 widestring::widestring(const char *from)
 {
        *this = from;
 }
 
+widestring::widestring(const std::string &from)
+{
+       *this = from.c_str();
+}
+
+widestring::widestring(const std::wstring &from)
+       : std::wstring(from)
+{
+}
+
 void widestring::operator= (const char *from)
 {
        if (!iconv_initialized) {
@@ -50,10 +66,3 @@ void widestring::operator= (const char *from)
        free(from_buf);
        delete[] to_buf;
 }
-
-template<>
-void pqxx::from_string<widestring>(const char *from, widestring &to)
-{
-       to = from;
-}
-