Make code reading BMP files more robust.

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

diff --git a/src/common/settcmn.cpp b/src/common/settcmn.cpp
index 34af54211852539efad3c6b417b6ce21a91deaa0..4c99c292a172fab7b55c42b3a315df5df03fd095 100644 (file)
--- a/src/common/settcmn.cpp
+++ b/src/common/settcmn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/settcmn.cpp
+// Name:        src/common/settcmn.cpp

 // 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$


@@ -15,10 +15,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "settings.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -26,10 +22,10 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/settings.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"

     #include "wx/utils.h"
     #include "wx/utils.h"

-    #include "wx/settings.h"

 #endif //WX_PRECOMP
 
 // ----------------------------------------------------------------------------
 #endif //WX_PRECOMP
 
 // ----------------------------------------------------------------------------


@@ -49,16 +45,16 @@ wxSystemScreenType wxSystemSettings::GetScreenType()
         int x = GetMetric( wxSYS_SCREEN_X );
 
         ms_screen = wxSYS_SCREEN_DESKTOP;
         int x = GetMetric( wxSYS_SCREEN_X );
 
         ms_screen = wxSYS_SCREEN_DESKTOP;

-            
+

         if (x < 800)
             ms_screen = wxSYS_SCREEN_SMALL;
         if (x < 800)
             ms_screen = wxSYS_SCREEN_SMALL;

-            
+

         if (x < 640)
             ms_screen = wxSYS_SCREEN_PDA;
         if (x < 640)
             ms_screen = wxSYS_SCREEN_PDA;

-            
+

         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;
         // This is probably a bug, but VNC seems to report 0
         if (x < 10)
             ms_screen = wxSYS_SCREEN_DESKTOP;


@@ -66,9 +62,8 @@ wxSystemScreenType wxSystemSettings::GetScreenType()
 
     return ms_screen;
 }
 
     return ms_screen;
 }

-    
+

 void wxSystemSettings::SetScreenType( wxSystemScreenType screen )
 {
     ms_screen = screen;
 }
 void wxSystemSettings::SetScreenType( wxSystemScreenType screen )
 {
     ms_screen = screen;
 }

-