Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv3949/src/gui
Modified Files:
wxMApp.cpp
Log Message:
corrected bug in EnsureAvailableTextEncoding() when text == NULL
Index: wxMApp.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMApp.cpp,v
retrieving revision 1.275
retrieving revision 1.276
diff -b -u -2 -r1.275 -r1.276
--- wxMApp.cpp 18 Sep 2003 16:30:53 -0000 1.275
+++ wxMApp.cpp 19 Sep 2003 22:50:03 -0000 1.276
@@ -2289,15 +2289,15 @@
{
wxEncodingConverter conv;
- if ( conv.Init(*enc, encAlt) )
- {
- *enc = encAlt;
-
- *text = conv.Convert(*text);
- }
- else // failed to convert the text
+ if ( !conv.Init(*enc, encAlt) )
{
+ // failed to convert the text
return false;
}
+
+ *text = conv.Convert(*text);
}
+ //else: just return the encoding
+
+ *enc = encAlt;
}
else //no equivalent encoding
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
