fixed LastRead() after Read(wxOutputStream&) (patch 1658301)

[wxWidgets.git] / src / msw / font.cpp

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index de28e3919e74e260e45bf272f54f477a59900ac4..397a8c14f06d0865e6c056716828262bba03a5f0 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -262,7 +262,7 @@ public:
         if ( m_nativeFontInfoOk )
             return m_nativeFontInfo.SetFaceName(faceName);
 
         if ( m_nativeFontInfoOk )
             return m_nativeFontInfo.SetFaceName(faceName);
 

-            m_faceName = faceName;
+        m_faceName = faceName;

         return true;
     }
 
         return true;
     }
 


@@ -321,7 +321,7 @@ protected:
     bool             m_nativeFontInfoOk;
 };
 
     bool             m_nativeFontInfoOk;
 };
 

-#define M_FONTDATA (wxFontRefData*)m_refData)
+#define M_FONTDATA ((wxFontRefData*)m_refData)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -1020,6 +1020,8 @@ int wxFont::GetPointSize() const
 
 wxSize wxFont::GetPixelSize() const
 {
 
 wxSize wxFont::GetPixelSize() const
 {

+    wxCHECK_MSG( Ok(), wxDefaultSize, wxT("invalid font") );
+

     return M_FONTDATA->GetPixelSize();
 }
 
     return M_FONTDATA->GetPixelSize();
 }
 


@@ -1074,12 +1076,14 @@ wxFontEncoding wxFont::GetEncoding() const
 
 const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
 
 const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {

-    return M_FONTDATA->HasNativeFontInfo() ? &(M_FONTDATA->GetNativeFontInfo())
+    return Ok() && M_FONTDATA->HasNativeFontInfo() ? &(M_FONTDATA->GetNativeFontInfo())

                                            : NULL;
 }
 
 wxString wxFont::GetNativeFontInfoDesc() const
 {
                                            : NULL;
 }
 
 wxString wxFont::GetNativeFontInfoDesc() const
 {

+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
+

     // be sure we have an HFONT associated...
     wxConstCast(this, wxFont)->RealizeResource();
     return wxFontBase::GetNativeFontInfoDesc();
     // be sure we have an HFONT associated...
     wxConstCast(this, wxFont)->RealizeResource();
     return wxFontBase::GetNativeFontInfoDesc();


@@ -1087,6 +1091,8 @@ wxString wxFont::GetNativeFontInfoDesc() const
 
 wxString wxFont::GetNativeFontInfoUserDesc() const
 {
 
 wxString wxFont::GetNativeFontInfoUserDesc() const
 {

+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
+

     // be sure we have an HFONT associated...
     wxConstCast(this, wxFont)->RealizeResource();
     return wxFontBase::GetNativeFontInfoUserDesc();
     // be sure we have an HFONT associated...
     wxConstCast(this, wxFont)->RealizeResource();
     return wxFontBase::GetNativeFontInfoUserDesc();