initialize m_initialized to false to avoid spurious asserts

[wxWidgets.git] / include / wx / os2 / font.h

diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h
index a306601251fd6a24aa8b9d57a4cdd1eab4cc6c5e..11792862cfbf720b6abd88f41e97aaf0d0ce2408 100644 (file)
--- a/include/wx/os2/font.h
+++ b/include/wx/os2/font.h
@@ -14,7 +14,6 @@
 
 #include "wx/gdiobj.h"
 #include "wx/os2/private.h"
 
 #include "wx/gdiobj.h"
 #include "wx/os2/private.h"

-#include "wx/fontutil.h"

 
 WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 


@@ -93,7 +92,7 @@ public:
     virtual bool              GetUnderlined(void) const;
     virtual wxString          GetFaceName(void) const;
     virtual wxFontEncoding    GetEncoding(void) const;
     virtual bool              GetUnderlined(void) const;
     virtual wxString          GetFaceName(void) const;
     virtual wxFontEncoding    GetEncoding(void) const;

-    virtual wxNativeFontInfo* GetNativeFontInfo() const;
+    virtual const wxNativeFontInfo* GetNativeFontInfo() const;

 
     virtual void SetPointSize(int nPointSize);
     virtual void SetFamily(int nFamily);
 
     virtual void SetPointSize(int nPointSize);
     virtual void SetFamily(int nFamily);


@@ -102,7 +101,6 @@ public:
     virtual void SetFaceName(const wxString& rsFaceName);
     virtual void SetUnderlined(bool bUnderlined);
     virtual void SetEncoding(wxFontEncoding vEncoding);
     virtual void SetFaceName(const wxString& rsFaceName);
     virtual void SetUnderlined(bool bUnderlined);
     virtual void SetEncoding(wxFontEncoding vEncoding);

-    virtual void SetNativeFontInfo(const wxNativeFontInfo& rInfo);

 
     //
     // For internal use only!
 
     //
     // For internal use only!


@@ -121,7 +119,10 @@ public:
     virtual bool     FreeResource(bool bForce = FALSE);
 
     WXHFONT GetHFONT(void) const;
     virtual bool     FreeResource(bool bForce = FALSE);
 
     WXHFONT GetHFONT(void) const;

+

 protected:
 protected:

+    virtual void DoSetNativeFontInfo(const wxNativeFontInfo& rInfo);
+

     //
     // Common part of all ctors
     //
     //
     // Common part of all ctors
     //