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

diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index a9cb16b074d8d9db928b1fe7d82134ddfb31ebee..c2a6fa43c8f6c5d59561b20b978788a885f27753 100644 (file)
--- 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;
     // PangoContext stuff for GTK 2.0
 #ifdef __WXGTK20__
     PangoContext *m_context;

+    PangoLayout *m_layout;

     PangoFontDescription *m_fontdesc;
 #endif
 
     PangoFontDescription *m_fontdesc;
 #endif
 

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index bad03b9d6b64cd008e13e2582d7200c07f6a15b7..d66fbe1c1c97222377a609dcba549ea5961cacf1 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -102,7 +102,9 @@ public:
     // implementation from now on
     void Unshare();
 
     // implementation from now on
     void Unshare();
 

+#ifndef __WXGTK20__

     GdkFont* GetInternalFont(float scale = 1.0) const;
     GdkFont* GetInternalFont(float scale = 1.0) const;

+#endif

 
     // no data :-)
 
 
     // no data :-)
 

diff --git a/include/wx/gtk1/dcclient.h b/include/wx/gtk1/dcclient.h
index a9cb16b074d8d9db928b1fe7d82134ddfb31ebee..c2a6fa43c8f6c5d59561b20b978788a885f27753 100644 (file)
--- 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;
     // PangoContext stuff for GTK 2.0
 #ifdef __WXGTK20__
     PangoContext *m_context;

+    PangoLayout *m_layout;

     PangoFontDescription *m_fontdesc;
 #endif
 
     PangoFontDescription *m_fontdesc;
 #endif
 

diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h
index bad03b9d6b64cd008e13e2582d7200c07f6a15b7..d66fbe1c1c97222377a609dcba549ea5961cacf1 100644 (file)
--- a/include/wx/gtk1/font.h
+++ b/include/wx/gtk1/font.h
@@ -102,7 +102,9 @@ public:
     // implementation from now on
     void Unshare();
 
     // implementation from now on
     void Unshare();
 

+#ifndef __WXGTK20__

     GdkFont* GetInternalFont(float scale = 1.0) const;
     GdkFont* GetInternalFont(float scale = 1.0) const;

+#endif

 
     // no data :-)
 
 
     // no data :-)