1. serious bug in wxRegConfig corrected - deleting a value would delete the

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

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index 32b37a954b5d85a9747985f36034c0f5271abfb6..a7a6609d2fe66f6bf911245d4f500ddc872a93e0 100644 (file)
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -44,7 +44,7 @@ protected:
 
 #define M_FONTDATA ((wxFontRefData *)m_refData)
 
 
 #define M_FONTDATA ((wxFontRefData *)m_refData)
 

-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;

 
 // Font
 class WXDLLEXPORT wxFont: public wxGDIObject
 
 // Font
 class WXDLLEXPORT wxFont: public wxGDIObject


@@ -68,7 +68,7 @@ public:
   virtual bool ReleaseResource(void);
 */
 
   virtual bool ReleaseResource(void);
 */
 

-  virtual bool IsFree(void);
+  virtual bool IsFree() const;

   virtual bool Ok(void) const { return (m_refData != NULL) ; }
 
   inline int GetPointSize(void) const { return M_FONTDATA->m_pointSize; }
   virtual bool Ok(void) const { return (m_refData != NULL) ; }
 
   inline int GetPointSize(void) const { return M_FONTDATA->m_pointSize; }


@@ -89,9 +89,9 @@ public:
   void SetFaceName(const wxString& faceName);
   void SetUnderlined(bool underlined);
 
   void SetFaceName(const wxString& faceName);
   void SetUnderlined(bool underlined);
 

-  inline wxFont& operator = (const wxFont& font) { if (*this == font) return (*this); Ref(font); return *this; }
-  inline bool operator == (const wxFont& font) { return m_refData == font.m_refData; }
-  inline bool operator != (const wxFont& font) { return m_refData != font.m_refData; }
+  wxFont& operator = (const wxFont& font) { if (*this == font) return (*this); Ref(font); return *this; }
+  bool operator == (const wxFont& font) const { return m_refData == font.m_refData; }
+  bool operator != (const wxFont& font) const { return m_refData != font.m_refData; }

 
 protected:
   void Unshare();
 
 protected:
   void Unshare();