Added another hyphen in "wxObject-derived" for consistency.

[wxWidgets.git] / interface / wx / sckipc.h

diff --git a/interface/wx/sckipc.h b/interface/wx/sckipc.h
index db37476d381977864fe084186613d4ac88777597..449bf7a05398444e54e89d6040bf21455062b813 100644 (file)
--- a/interface/wx/sckipc.h
+++ b/interface/wx/sckipc.h
@@ -31,13 +31,7 @@ enum wxIPCFormat
   wxIPC_LOCALE =           16,
   wxIPC_UTF8TEXT =         17,
   wxIPC_UTF32TEXT =        18,
   wxIPC_LOCALE =           16,
   wxIPC_UTF8TEXT =         17,
   wxIPC_UTF32TEXT =        18,

-#if SIZEOF_WCHAR_T == 2
-  wxIPC_UNICODETEXT = wxIPC_UTF16TEXT,
-#elif SIZEOF_WCHAR_T == 4
-  wxIPC_UNICODETEXT = wxIPC_UTF32TEXT,
-#else
-#  error "Unknown wchar_t size"
-#endif
+  wxIPC_UNICODETEXT,

   wxIPC_PRIVATE =          20
 };
 
   wxIPC_PRIVATE =          20
 };
 


@@ -328,7 +322,7 @@ public:
         Returns a character string (actually a pointer to the connection's buffer) if
         successful, @NULL otherwise.
     */
         Returns a character string (actually a pointer to the connection's buffer) if
         successful, @NULL otherwise.
     */

-    const void* Request(const wxString& item, size_t* size,
+    virtual const void* Request(const wxString& item, size_t* size = 0,

                         wxIPCFormat format = wxIPC_TEXT);
 
     /**
                         wxIPCFormat format = wxIPC_TEXT);
 
     /**