wxTreeCtrl::GetBoundRect() implemented

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

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index 5c1f7dc6b0aff793483bf99c613b3b0c1c4adbf8..32b37a954b5d85a9747985f36034c0f5271abfb6 100644 (file)
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __FONTH__
-#define __FONTH__
+#ifndef _WX_FONT_H_
+#define _WX_FONT_H_

 
 #ifdef __GNUG__
 #pragma interface "font.h"
 
 #ifdef __GNUG__
 #pragma interface "font.h"


@@ -25,6 +25,7 @@ class WXDLLEXPORT wxFontRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxFont;
 public:
     wxFontRefData(void);
     friend class WXDLLEXPORT wxFont;
 public:
     wxFontRefData(void);

+    wxFontRefData(const wxFontRefData& data);

     ~wxFontRefData(void);
 protected:
   bool          m_temporary;   // If TRUE, the pointer to the actual font
     ~wxFontRefData(void);
 protected:
   bool          m_temporary;   // If TRUE, the pointer to the actual font


@@ -53,7 +54,6 @@ public:
   wxFont(void);
   wxFont(int PointSize, int Family, int Style, int Weight, bool underlined = FALSE, const wxString& Face = wxEmptyString);
   inline wxFont(const wxFont& font) { Ref(font); }
   wxFont(void);
   wxFont(int PointSize, int Family, int Style, int Weight, bool underlined = FALSE, const wxString& Face = wxEmptyString);
   inline wxFont(const wxFont& font) { Ref(font); }

-  inline wxFont(const wxFont* font) { /* UnRef(); */ if (font) Ref(*font); }

 
   ~wxFont(void);
 
 
   ~wxFont(void);
 


@@ -92,7 +92,10 @@ 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; }
   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; }

+
+protected:
+  void Unshare();

 };
 
 #endif
 };
 
 #endif

-    // __FONTH__
+    // _WX_FONT_H_