Applied Patch #1424869: Implement wxListCtrl::SetItemColumnImage

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

diff --git a/include/wx/palmos/font.h b/include/wx/palmos/font.h
index 3ec690b1e75acbc208688edb6d8a59f5cd078bd5..146e45eeffb4ae0c2977d089f60c6d267d18ef0b 100644 (file)
--- a/include/wx/palmos/font.h
+++ b/include/wx/palmos/font.h
@@ -22,8 +22,7 @@ class WXDLLEXPORT wxFont : public wxFontBase
 {
 public:
     // ctors and such
 {
 public:
     // ctors and such

-    wxFont() { Init(); }
-    wxFont(const wxFont& font) : wxFontBase(font) { Init(); Ref(font); }
+    wxFont() { }

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


@@ -33,8 +32,6 @@ public:
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {

-        Init();
-

         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 


@@ -46,16 +43,12 @@ public:
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {

-        Init();
-

         (void)Create(pixelSize, family, style, weight,
                      underlined, face, encoding);
     }
 
     wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0)
     {
         (void)Create(pixelSize, family, style, weight,
                      underlined, face, encoding);
     }
 
     wxFont(const wxNativeFontInfo& info, WXHFONT hFont = 0)
     {

-        Init();
-

         Create(info, hFont);
     }
 
         Create(info, hFont);
     }
 


@@ -89,9 +82,6 @@ public:
 
     virtual ~wxFont();
 
 
     virtual ~wxFont();
 

-    // assignment
-    wxFont& operator=(const wxFont& font);
-

     // implement base class pure virtuals
     virtual int GetPointSize() const;
     virtual wxSize GetPixelSize() const;
     // implement base class pure virtuals
     virtual int GetPointSize() const;
     virtual wxSize GetPixelSize() const;


@@ -137,9 +127,6 @@ protected:
 
     virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
 
 
     virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
 

-    // common part of all ctors
-    void Init();
-

     void Unshare();
 
 private:
     void Unshare();
 
 private: