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

Compile fix for wxchar.cpp,

Browse Source 
PDA screen size code for all ports.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@22296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2003-07-25 18:55:02 +00:00
parent 48e5489066
commit feac3e3a38
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/settcmn.cpp
View File

@@ -44,12 +44,6 @@ wxSystemScreenType wxSystemSettings::ms_screen = wxSYS_SCREEN_NONE;
wxSystemScreenType wxSystemSettings::GetScreenType() wxSystemScreenType wxSystemSettings::GetScreenType()
{ {
if (ms_screen == wxSYS_SCREEN_NONE) if (ms_screen == wxSYS_SCREEN_NONE)
#ifndef __WXUNIVERSAL__
{
// As a start, all GUI are desktops.
ms_screen = wxSYS_SCREEN_DESKTOP;
}
#else
{ {
// wxUniv will be used on small devices, too. // wxUniv will be used on small devices, too.
int x = GetMetric( wxSYS_SCREEN_X ); int x = GetMetric( wxSYS_SCREEN_X );
@@ -65,7 +59,6 @@ wxSystemScreenType wxSystemSettings::GetScreenType()
if (x < 200) if (x < 200)
ms_screen = wxSYS_SCREEN_TINY; ms_screen = wxSYS_SCREEN_TINY;
} }
#endif
return ms_screen; return ms_screen;
} }

2
src/common/wxchar.cpp
View File

@@ -586,7 +586,7 @@ int vfwprintf(FILE *stream, const wxChar *format, va_list argptr)
if ( rc != -1 ) if ( rc != -1 )
{ {
// we can't do much better without Unicode support in libc... // we can't do much better without Unicode support in libc...
if ( fprintf(stream, "%s", s.mb_str()) == -1 ) if ( fprintf(stream, "%s", (const char*)s.mb_str()) == -1 )
return -1; return -1;
} }