Compile fix for prop.

  Test change for dcclient.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/prop.cpp b/src/generic/prop.cpp
index cca2ecdd45191a1cea1297ca05a2a5e5ec51e5e5..ae8170a5abce62ce951c867304ae54bbfe20c48b 100644 (file)
--- a/src/generic/prop.cpp
+++ b/src/generic/prop.cpp
@@ -1141,13 +1141,13 @@ bool wxPropertyValidator::StringToLong (wxChar *s, long *number) {
 
 wxChar *wxPropertyValidator::FloatToString (float number) {
     static wxChar buf[20];
 
 wxChar *wxPropertyValidator::FloatToString (float number) {
     static wxChar buf[20];

-    wxSprintf (buf, wxT("%.6g"), number);
+    wxSnprintf (buf, 20, wxT("%.6g"), number);

     return buf;
 }
 
 wxChar *wxPropertyValidator::DoubleToString (double number) {
     static wxChar buf[20];
     return buf;
 }
 
 wxChar *wxPropertyValidator::DoubleToString (double number) {
     static wxChar buf[20];

-    wxSprintf (buf, wxT("%.6g"), number);
+    wxSnprintf (buf, 20, wxT("%.6g"), number);

     return buf;
 }
 
     return buf;
 }
 

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 2b469dfbea42e5f0efd4d12f513d9456b082feb7..8a33377614f4ee655fe3b30a85f10363416ecb19 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -332,6 +332,10 @@ wxWindowDC::wxWindowDC( wxWindow *window )
 #ifdef __WXGTK20__
     m_context = gtk_widget_get_pango_context( widget );
     
 #ifdef __WXGTK20__
     m_context = gtk_widget_get_pango_context( widget );
     

+    // Always take Xft context to get matching fonts
+    // for display and printing.
+    // m_context = pango_xft_get_context (GDK_DISPLAY (), DefaultScreen (GDK_DISPLAY ()));
+    

     m_fontdesc = widget->style->font_desc;
 #endif
 
     m_fontdesc = widget->style->font_desc;
 #endif
 

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 2b469dfbea42e5f0efd4d12f513d9456b082feb7..8a33377614f4ee655fe3b30a85f10363416ecb19 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -332,6 +332,10 @@ wxWindowDC::wxWindowDC( wxWindow *window )
 #ifdef __WXGTK20__
     m_context = gtk_widget_get_pango_context( widget );
     
 #ifdef __WXGTK20__
     m_context = gtk_widget_get_pango_context( widget );
     

+    // Always take Xft context to get matching fonts
+    // for display and printing.
+    // m_context = pango_xft_get_context (GDK_DISPLAY (), DefaultScreen (GDK_DISPLAY ()));
+    

     m_fontdesc = widget->style->font_desc;
 #endif
 
     m_fontdesc = widget->style->font_desc;
 #endif