From feac3e3a38c583cdaeca5e425ce1edc1840a7f3f Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Fri, 25 Jul 2003 18:55:02 +0000
Subject: [PATCH]  Compile fix for wxchar.cpp,  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
---
 src/common/settcmn.cpp | 7 -------
 src/common/wxchar.cpp  | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/common/settcmn.cpp b/src/common/settcmn.cpp
index 6e84b6a118..1a890fad16 100644
--- a/src/common/settcmn.cpp
+++ b/src/common/settcmn.cpp
@@ -44,12 +44,6 @@ wxSystemScreenType wxSystemSettings::ms_screen = wxSYS_SCREEN_NONE;
 wxSystemScreenType wxSystemSettings::GetScreenType()
 {
     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.
         int x = GetMetric( wxSYS_SCREEN_X );
@@ -65,7 +59,6 @@ wxSystemScreenType wxSystemSettings::GetScreenType()
         if (x < 200)
             ms_screen = wxSYS_SCREEN_TINY;
     }
-#endif
 
     return ms_screen;
 }
diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index cffcebd01b..0b46889b8b 100644
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -586,7 +586,7 @@ int vfwprintf(FILE *stream, const wxChar *format, va_list argptr)
     if ( rc != -1 )
     {
         // 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;
     }