Return NULL from wxWindow::GetCapture() when the capture is being lost.

[wxWidgets.git] / src / common / fontenumcmn.cpp

diff --git a/src/common/fontenumcmn.cpp b/src/common/fontenumcmn.cpp
index aaae1543c403f8b0a77e16b4336da6e702b9e61f..1185a864ab3130094d1709228456069159e65578 100644 (file)
--- a/src/common/fontenumcmn.cpp
+++ b/src/common/fontenumcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     7/5/2006
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     7/5/2006

-// RCS-ID:      $Id$

 // Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -84,12 +83,12 @@ bool wxFontEnumerator::IsValidFacename(const wxString &facename)
 
 #ifdef __WXMSW__
     // Quoting the MSDN:
 
 #ifdef __WXMSW__
     // Quoting the MSDN:

-    //     "MS Shell Dlg is a mapping mechanism that enables 
-    //     U.S. English Microsoft Windows NT, and Microsoft Windows 2000 to 
-    //     support locales that have characters that are not contained in code 
+    //     "MS Shell Dlg is a mapping mechanism that enables
+    //     U.S. English Microsoft Windows NT, and Microsoft Windows 2000 to
+    //     support locales that have characters that are not contained in code

     //     page 1252. It is not a font but a face name for a nonexistent font."
     // Thus we need to consider "Ms Shell Dlg" and "Ms Shell Dlg 2" as valid
     //     page 1252. It is not a font but a face name for a nonexistent font."
     // Thus we need to consider "Ms Shell Dlg" and "Ms Shell Dlg 2" as valid

-    // font face names even if they are enumerated by wxFontEnumerator
+    // font face names even if they are not enumerated by wxFontEnumerator

     if (facename.IsSameAs(wxT("Ms Shell Dlg"), false) ||
         facename.IsSameAs(wxT("Ms Shell Dlg 2"), false))
         return true;
     if (facename.IsSameAs(wxT("Ms Shell Dlg"), false) ||
         facename.IsSameAs(wxT("Ms Shell Dlg 2"), false))
         return true;


@@ -107,7 +106,7 @@ bool wxFontEnumerator::EnumerateEncodingsUTF8(const wxString& facename)
 {
     // name of UTF-8 encoding: no need to use wxFontMapper for it as it's
     // unlikely to change
 {
     // name of UTF-8 encoding: no need to use wxFontMapper for it as it's
     // unlikely to change

-    const wxString utf8(_T("UTF-8"));
+    const wxString utf8(wxT("UTF-8"));

 
     // all fonts are in UTF-8 only if this code is used
     if ( !facename.empty() )
 
     // all fonts are in UTF-8 only if this code is used
     if ( !facename.empty() )