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
This commit is contained in:
parent
5c6fa7d283
commit
9ac71bef07
@ -1141,13 +1141,13 @@ bool wxPropertyValidator::StringToLong (wxChar *s, long *number) {
|
||||
|
||||
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];
|
||||
wxSprintf (buf, wxT("%.6g"), number);
|
||||
wxSnprintf (buf, 20, wxT("%.6g"), number);
|
||||
return buf;
|
||||
}
|
||||
|
||||
|
@ -332,6 +332,10 @@ wxWindowDC::wxWindowDC( wxWindow *window )
|
||||
#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
|
||||
|
||||
|
@ -332,6 +332,10 @@ wxWindowDC::wxWindowDC( wxWindow *window )
|
||||
#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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user