accept files in wxHtmlEasyPrinting::{Print,Preview}File, not only URLs

[wxWidgets.git] / src / common / settcmn.cpp

diff --git a/src/common/settcmn.cpp b/src/common/settcmn.cpp
index 6e84b6a118ace22e93fde7e61da6fbb933ae4f03..34af54211852539efad3c6b417b6ce21a91deaa0 100644 (file)
--- a/src/common/settcmn.cpp
+++ b/src/common/settcmn.cpp
@@ -3,8 +3,8 @@
 // Purpose:     common (to all ports) wxWindow functions
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Purpose:     common (to all ports) wxWindow functions
 // Author:      Robert Roebling
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -15,7 +15,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "settings.h"
 #endif
 
     #pragma implementation "settings.h"
 #endif
 


@@ -44,12 +44,6 @@ wxSystemScreenType wxSystemSettings::ms_screen = wxSYS_SCREEN_NONE;
 wxSystemScreenType wxSystemSettings::GetScreenType()
 {
     if (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 );
     {
         // wxUniv will be used on small devices, too.
         int x = GetMetric( wxSYS_SCREEN_X );


@@ -64,8 +58,11 @@ wxSystemScreenType wxSystemSettings::GetScreenType()
             
         if (x < 200)
             ms_screen = wxSYS_SCREEN_TINY;
             
         if (x < 200)
             ms_screen = wxSYS_SCREEN_TINY;

+            
+        // This is probably a bug, but VNC seems to report 0
+        if (x < 10)
+            ms_screen = wxSYS_SCREEN_DESKTOP;

     }
     }

-#endif

 
     return ms_screen;
 }
 
     return ms_screen;
 }