From 138618acb91e2a879a735c5806f9f728220f14df Mon Sep 17 00:00:00 2001 From: Robert Roebling <robert@roebling.de> Date: Sun, 26 Jan 2003 12:39:51 +0000 Subject: [PATCH] Small speed up to fonts and support for scaling. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/dcclient.h | 1 + include/wx/gtk/font.h | 2 ++ include/wx/gtk1/dcclient.h | 1 + include/wx/gtk1/font.h | 2 ++ 4 files changed, 6 insertions(+) diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h index a9cb16b074..c2a6fa43c8 100644 --- a/include/wx/gtk/dcclient.h +++ b/include/wx/gtk/dcclient.h @@ -122,6 +122,7 @@ public: // PangoContext stuff for GTK 2.0 #ifdef __WXGTK20__ PangoContext *m_context; + PangoLayout *m_layout; PangoFontDescription *m_fontdesc; #endif diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h index bad03b9d6b..d66fbe1c1c 100644 --- a/include/wx/gtk/font.h +++ b/include/wx/gtk/font.h @@ -102,7 +102,9 @@ public: // implementation from now on void Unshare(); +#ifndef __WXGTK20__ GdkFont* GetInternalFont(float scale = 1.0) const; +#endif // no data :-) diff --git a/include/wx/gtk1/dcclient.h b/include/wx/gtk1/dcclient.h index a9cb16b074..c2a6fa43c8 100644 --- a/include/wx/gtk1/dcclient.h +++ b/include/wx/gtk1/dcclient.h @@ -122,6 +122,7 @@ public: // PangoContext stuff for GTK 2.0 #ifdef __WXGTK20__ PangoContext *m_context; + PangoLayout *m_layout; PangoFontDescription *m_fontdesc; #endif diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h index bad03b9d6b..d66fbe1c1c 100644 --- a/include/wx/gtk1/font.h +++ b/include/wx/gtk1/font.h @@ -102,7 +102,9 @@ public: // implementation from now on void Unshare(); +#ifndef __WXGTK20__ GdkFont* GetInternalFont(float scale = 1.0) const; +#endif // no data :-) -- 2.45.2