Cast for argument to delete[] - VC6 doesn't want to delete a const pointer

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

diff --git a/include/wx/cocoa/font.h b/include/wx/cocoa/font.h
index a8bf9f227510fc053727fbfa35a3cf27e455de85..c11e4e3e0134d8b883ccaa505ad4985bc8e88fce 100644 (file)
--- a/include/wx/cocoa/font.h
+++ b/include/wx/cocoa/font.h
@@ -16,12 +16,30 @@
 // wxFont
 // ----------------------------------------------------------------------------
 
 // wxFont
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFont : public wxFontBase
+DECLARE_WXCOCOA_OBJC_CLASS(NSFont);
+
+// Internal class that bridges us with code like wxSystemSettings
+class wxCocoaFontFactory;
+// We have c-tors/methods taking pointers of these
+class wxFontRefData;
+
+/*! @discussion
+    wxCocoa's implementation of wxFont is very incomplete.  In particular,
+    a lot of work needs to be done on wxNativeFontInfo which is currently
+    using the totally generic implementation.
+
+    See the documentation in src/cocoa/font.mm for more implementatoin details.
+ */
+class WXDLLIMPEXP_CORE wxFont : public wxFontBase

 {
 {

+    friend class wxCocoaFontFactory;

 public:
 public:

-    // ctors and such
+    /*! @abstract   Default construction of invalid font for 2-step construct then Create process.
+     */

     wxFont() { }
 
     wxFont() { }
 

+    /*! @abstract   Platform-independent construction with individual properties
+     */

     wxFont(int size,
            int family,
            int style,
     wxFont(int size,
            int family,
            int style,


@@ -33,13 +51,20 @@ public:
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 

+    /*! @abstract   Construction with opaque wxNativeFontInfo
+     */

     wxFont(const wxNativeFontInfo& info)
     {
         (void)Create(info);
     }
 
     wxFont(const wxNativeFontInfo& info)
     {
         (void)Create(info);
     }
 

+    /*! @abstract   Construction with platform-dependent font descriptor string.
+        @param  fontDesc        Usually the result of wxNativeFontInfo::ToUserString()
+     */

     wxFont(const wxString& fontDesc);
 
     wxFont(const wxString& fontDesc);
 

+    // NOTE: Copy c-tor and assignment from wxObject is fine
+

     bool Create(int size,
                 int family,
                 int style,
     bool Create(int size,
                 int family,
                 int style,


@@ -73,10 +98,30 @@ public:
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 

+    /*! @abstract   Defined on some ports (not including this one) in wxGDIObject
+        @discussion
+        The intention here I suppose is to allow one to create a wxFont without yet
+        creating the underlying native object.  There's no point not to create the
+        NSFont immediately in wxCocoa so this is useless.
+        This method came from the stub code copied in the early days of wxCocoa.
+        FIXME(1): Remove this in trunk.  FIXME(2): Is it really a good idea for this to
+        be part of the public API for wxGDIObject?
+     */

     virtual bool RealizeResource();
 
 protected:
     virtual bool RealizeResource();
 
 protected:

-    void Unshare();
+    /*! @abstract   Internal constructor with ref data
+        @discussion
+        Takes ownership of @a refData.  That is, it is assumed that refData has either just been
+        created using new (which initializes its m_refCount to 1) or if you are sharing a ref that
+        you have called IncRef on it before passing it to this method.
+     */
+    explicit wxFont(wxFontRefData *refData)
+    {   Create(refData); }
+    bool Create(wxFontRefData *refData);
+
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)