fix the wrong #ifdef WXWIN_COMPATIBILITY_2_8 checks, #if should be used (#9644)

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

diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h
index e6033d971a1cebbd89c390cb1affefbd7df6878f..62250ef33b97ea30d9bf5d774d83e1b58b3d997d 100644 (file)
--- a/include/wx/gtk1/font.h
+++ b/include/wx/gtk1/font.h
@@ -16,11 +16,11 @@
 // classes
 // ----------------------------------------------------------------------------
 
 // classes
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxDC;
-class WXDLLIMPEXP_CORE wxPaintDC;
-class WXDLLIMPEXP_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxDC;
+class WXDLLIMPEXP_FWD_CORE wxPaintDC;
+class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 

-class WXDLLIMPEXP_CORE wxFont;
+class WXDLLIMPEXP_FWD_CORE wxFont;

 
 // ----------------------------------------------------------------------------
 // wxFont
 
 // ----------------------------------------------------------------------------
 // wxFont


@@ -62,7 +62,7 @@ public:
     // wxGTK-specific
     bool Create(const wxString& fontname);
 
     // wxGTK-specific
     bool Create(const wxString& fontname);
 

-    ~wxFont();
+    virtual ~wxFont();

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


@@ -91,9 +91,10 @@ public:
 
     GdkFont* GetInternalFont(float scale = 1.0) const;
 
 
     GdkFont* GetInternalFont(float scale = 1.0) const;
 

-    // no data :-)
-

 protected:
 protected:

+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+

     virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
 
 private:
     virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
 
 private: