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 a4739023f63d5e58385a27f16e3f9357348b1dc5..fa9d1c9edb10f0c1ec4fb3024fbacd23730e3ceb 100644 (file)
--- a/include/wx/x11/font.h
+++ b/include/wx/x11/font.h
@@ -12,19 +12,14 @@
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "font.h"
-#endif
-

 class wxXFont;
 
 // Font
 class wxXFont;
 
 // Font

-class wxFont : public wxFontBase
+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,


@@ -34,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);
     }
 


@@ -60,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;


@@ -84,7 +74,7 @@ public:
     virtual void SetEncoding(wxFontEncoding encoding);
 
     virtual void SetNoAntiAliasing( bool no = TRUE );
     virtual void SetEncoding(wxFontEncoding encoding);
 
     virtual void SetNoAntiAliasing( bool no = TRUE );

-    virtual bool GetNoAntiAliasing();
+    virtual bool GetNoAntiAliasing() const ;

 
     // Implementation
 
 
     // Implementation
 


@@ -113,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: