Added style parameter to wxPopupWindow ctors so they match the Create method.

[wxWidgets.git] / src / xrc / xmlexpat.cpp

diff --git a/src/xrc/xmlexpat.cpp b/src/xrc/xmlexpat.cpp
index c7894b4c76700951cbad40d07599589e72bbe3eb..47be0b67d19c88d13be68daa07a50fffd78871c9 100644 (file)
--- a/src/xrc/xmlexpat.cpp
+++ b/src/xrc/xmlexpat.cpp
@@ -33,7 +33,7 @@
 
      - handle unknown encodings
      - process all elements, including CDATA
 
      - handle unknown encodings
      - process all elements, including CDATA

-     - XML resources should automatically select desired encoding besed on
+     - XML resources should automatically select desired encoding based on

        runtime environment (?) (would need BIN and BINZ formats modification,
        too)
 
        runtime environment (?) (would need BIN and BINZ formats modification,
        too)
 


@@ -44,7 +44,7 @@
 inline static wxString CharToString(const char *s, size_t len = wxSTRING_MAXLEN)
 {
 #if wxUSE_UNICODE
 inline static wxString CharToString(const char *s, size_t len = wxSTRING_MAXLEN)
 {
 #if wxUSE_UNICODE

-    return wxString(s, wxMBConvUTF8, len);
+    return wxString(s, wxConvUTF8, len);

 #else
     return wxString(s, len);
 #endif
 #else
     return wxString(s, len);
 #endif