put wxUSE_DATAVIEWCTRL in alphabetical order

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

diff --git a/include/wx/x11/font.h b/include/wx/x11/font.h
index bb37d93fecff87a84e2eb2edaae8263e5953165a..fa9d1c9edb10f0c1ec4fb3024fbacd23730e3ceb 100644 (file)
--- a/include/wx/x11/font.h
+++ b/include/wx/x11/font.h
@@ -19,8 +19,7 @@ class WXDLLIMPEXP_CORE wxFont : public wxFontBase
 {
 public:
     // ctors and such
 {
 public:
     // ctors and such

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

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


@@ -30,8 +29,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);
     }
 


@@ -56,9 +53,6 @@ public:
 
     virtual ~wxFont();
 
 
     virtual ~wxFont();
 

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

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


@@ -109,9 +103,6 @@ public:
 protected:
     virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
 
 protected:
     virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
 

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

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