Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile fix for prop.

Browse Source 
Test change for dcclient.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-08-25 20:27:35 +00:00
parent 5c6fa7d283
commit 9ac71bef07
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/generic/prop.cpp
View File

@@ -1141,13 +1141,13 @@ bool wxPropertyValidator::StringToLong (wxChar *s, long *number) {
wxChar *wxPropertyValidator::FloatToString (float number) { wxChar *wxPropertyValidator::FloatToString (float number) {
static wxChar buf[20]; static wxChar buf[20];
wxSprintf (buf, wxT("%.6g"), number); wxSnprintf (buf, 20, wxT("%.6g"), number);
return buf; return buf;
} }
wxChar *wxPropertyValidator::DoubleToString (double number) { wxChar *wxPropertyValidator::DoubleToString (double number) {
static wxChar buf[20]; static wxChar buf[20];
wxSprintf (buf, wxT("%.6g"), number); wxSnprintf (buf, 20, wxT("%.6g"), number);
return buf; return buf;
} }

4
src/gtk/dcclient.cpp
View File

@@ -332,6 +332,10 @@ wxWindowDC::wxWindowDC( wxWindow *window )
#ifdef __WXGTK20__ #ifdef __WXGTK20__
m_context = gtk_widget_get_pango_context( widget ); 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; m_fontdesc = widget->style->font_desc;
#endif #endif

4
src/gtk1/dcclient.cpp
View File

@@ -332,6 +332,10 @@ wxWindowDC::wxWindowDC( wxWindow *window )
#ifdef __WXGTK20__ #ifdef __WXGTK20__
m_context = gtk_widget_get_pango_context( widget ); 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; m_fontdesc = widget->style->font_desc;
#endif #endif