Fixes for WXWIN_COMPATIBILITY, and BC++ fix for event.cpp

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

diff --git a/include/wx/stubs/font.h b/include/wx/stubs/font.h
index 4241a37393c465078f670879b9d171828c2c0656..601657c657897f59bf0c8dd791e64028e99dcfec 100644 (file)
--- a/include/wx/stubs/font.h
+++ b/include/wx/stubs/font.h
@@ -25,11 +25,11 @@ class WXDLLEXPORT wxFontRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxFont;
 public:
     wxFontRefData();
+    wxFontRefData(const wxFontRefData& data);
     ~wxFontRefData();
 protected:
   int           m_pointSize;
   int           m_family;
-  int           m_fontId;
   int           m_style;
   int           m_weight;
   bool          m_underlined;
@@ -49,19 +49,18 @@ class WXDLLEXPORT wxFont: public wxGDIObject
   DECLARE_DYNAMIC_CLASS(wxFont)
 public:
   wxFont();
-  wxFont(int PointSize, int Family, int Style, int Weight, bool underlined = FALSE, const wxString& Face = wxEmptyString);
+  wxFont(int pointSize, int family, int style, int weight, bool underlined = FALSE, const wxString& faceName = wxEmptyString);
   inline wxFont(const wxFont& font) { Ref(font); }
-  inline wxFont(const wxFont* font) { /* UnRef(); */ if (font) Ref(*font); }
+  inline wxFont(const wxFont* font) { if (font) Ref(*font); }
 
   ~wxFont();
 
-  bool Create(int PointSize, int Family, int Style, int Weight, bool underlined = FALSE, const wxString& Face = wxEmptyString);
+  bool Create(int pointSize, int family, int style, int weight, bool underlined = FALSE, const wxString& faceName = wxEmptyString);
 
   virtual bool Ok() const { return (m_refData != NULL) ; }
 
   inline int GetPointSize() const { return M_FONTDATA->m_pointSize; }
   inline int GetFamily() const { return M_FONTDATA->m_family; }
-  inline int GetFontId() const { return M_FONTDATA->m_fontId; } /* New font system */
   inline int GetStyle() const { return M_FONTDATA->m_style; }
   inline int GetWeight() const { return M_FONTDATA->m_weight; }
   wxString GetFamilyString() const ;
@@ -80,6 +79,11 @@ public:
   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; }
+
+  // Implementation
+protected:
+  bool RealizeResource();
+  void Unshare();
 };
 
 #endif