Added zillions of #if wxUSE_XXX
Removed cmndlgs usage of wxSizer and constraints Changed occurences of wxConv_xxx to wxConvXxxx and changed some wxConvLibc to wxConvCurrent Added Unicode tests to typetests (not finished) Compile fix for wxString in Unicode mode - we have to use the "experimental" printf then, I guess. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -401,7 +401,7 @@ static GdkFont*wxLoadQueryFont( int pointSize, int family, int style, int weight
|
||||
if (!facename.IsEmpty())
|
||||
{
|
||||
wxSprintf( wxBuffer, _T("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"), facename.c_str() );
|
||||
GdkFont *test = gdk_font_load( wxConv_libc.cWX2MB(wxBuffer) );
|
||||
GdkFont *test = gdk_font_load( wxConvCurrent->cWX2MB(wxBuffer) );
|
||||
if (test)
|
||||
{
|
||||
gdk_font_unref( test );
|
||||
@@ -427,7 +427,7 @@ static GdkFont*wxLoadQueryFont( int pointSize, int family, int style, int weight
|
||||
wxSprintf( wxBuffer, _T("-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-*-*"),
|
||||
xfamily, xweight, xstyle, pointSize);
|
||||
|
||||
return gdk_font_load( wxConv_libc.cWX2MB(wxBuffer) );
|
||||
return gdk_font_load( wxConvCurrent->cWX2MB(wxBuffer) );
|
||||
}
|
||||
|
||||
static GdkFont *wxLoadQueryNearestFont( int point_size, int family, int style, int weight,
|
||||
|
Reference in New Issue
Block a user