!__WX_DC_BLIT_FIXED__ case

[wxWidgets.git] / src / mac / classic / settings.cpp

diff --git a/src/mac/classic/settings.cpp b/src/mac/classic/settings.cpp
index cdf38e8755a52a29510ecedbe8e2d25302d89cbe..5e24b61348e839e71726468a65fa68a0c82e95d0 100644 (file)
--- a/src/mac/classic/settings.cpp
+++ b/src/mac/classic/settings.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        settings.cpp
+// Name:        src/mac/classic/settings.cpp

 // Purpose:     wxSettings
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxSettings
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,13 +9,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "settings.h"
-#endif
+#include "wx/wxprec.h"

 
 #include "wx/settings.h"
 
 #include "wx/settings.h"

-#include "wx/gdicmn.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/gdicmn.h"
+#endif

 
 #include "wx/mac/uma.h"
 
 
 #include "wx/mac/uma.h"
 


@@ -31,7 +32,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 {
     int major,minor;
     wxGetOsVersion( &major, &minor );
 {
     int major,minor;
     wxGetOsVersion( &major, &minor );

-    
+

     switch( index )
     {
         case wxSYS_COLOUR_SCROLLBAR :
     switch( index )
     {
         case wxSYS_COLOUR_SCROLLBAR :


@@ -82,7 +83,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         case wxSYS_COLOUR_GRAYTEXT:
             return wxColor( 0xCC , 0xCC , 0xCC ) ;
             break ;
         case wxSYS_COLOUR_GRAYTEXT:
             return wxColor( 0xCC , 0xCC , 0xCC ) ;
             break ;

-    
+

         case wxSYS_COLOUR_3DDKSHADOW:
             return wxColor( 0x44 , 0x44 , 0x44 ) ;
             break ;
         case wxSYS_COLOUR_3DDKSHADOW:
             return wxColor( 0x44 , 0x44 , 0x44 ) ;
             break ;


@@ -100,7 +101,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
             }
             break ;
         case wxSYS_COLOUR_INFOBK :
             }
             break ;
         case wxSYS_COLOUR_INFOBK :

-        case wxSYS_COLOUR_APPWORKSPACE: 
+        case wxSYS_COLOUR_APPWORKSPACE:

             return *wxWHITE ;
             break ;
 
             return *wxWHITE ;
             break ;
 


@@ -110,7 +111,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         case wxSYS_COLOUR_MENUHILIGHT:
             // TODO
             return *wxBLACK;
         case wxSYS_COLOUR_MENUHILIGHT:
             // TODO
             return *wxBLACK;

-         
+

         case wxSYS_COLOUR_MAX:
             wxFAIL_MSG( _T("unknown system colour index") );
             break ;
         case wxSYS_COLOUR_MAX:
             wxFAIL_MSG( _T("unknown system colour index") );
             break ;


@@ -142,7 +143,6 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
                 return *wxNORMAL_FONT ;
                     } ;
             break ;
                 return *wxNORMAL_FONT ;
                     } ;
             break ;

-                

     }
     return *wxNORMAL_FONT;
 }
     }
     return *wxNORMAL_FONT;
 }


@@ -161,7 +161,7 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
         case wxSYS_MOUSE_BUTTONS:
             // we emulate a two button mouse (ctrl + click = right button )
             return 2;
         case wxSYS_MOUSE_BUTTONS:
             // we emulate a two button mouse (ctrl + click = right button )
             return 2;

-            
+

         // TODO case wxSYS_BORDER_X:
         // TODO case wxSYS_BORDER_Y:
         // TODO case wxSYS_CURSOR_X:
         // TODO case wxSYS_BORDER_X:
         // TODO case wxSYS_BORDER_Y:
         // TODO case wxSYS_CURSOR_X:


@@ -172,33 +172,33 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
         // TODO case wxSYS_DRAG_Y:
         // TODO case wxSYS_EDGE_X:
         // TODO case wxSYS_EDGE_Y:
         // TODO case wxSYS_DRAG_Y:
         // TODO case wxSYS_EDGE_X:
         // TODO case wxSYS_EDGE_Y:

-            
+

         case wxSYS_HSCROLL_ARROW_X:
             return 16;
         case wxSYS_HSCROLL_ARROW_Y:
             return 16;
         case wxSYS_HTHUMB_X:
             return 16;
         case wxSYS_HSCROLL_ARROW_X:
             return 16;
         case wxSYS_HSCROLL_ARROW_Y:
             return 16;
         case wxSYS_HTHUMB_X:
             return 16;

-            
+

         // TODO case wxSYS_ICON_X:
         // TODO case wxSYS_ICON_Y:
         // TODO case wxSYS_ICONSPACING_X:
         // TODO case wxSYS_ICONSPACING_Y:
         // TODO case wxSYS_WINDOWMIN_X:
         // TODO case wxSYS_WINDOWMIN_Y:
         // TODO case wxSYS_ICON_X:
         // TODO case wxSYS_ICON_Y:
         // TODO case wxSYS_ICONSPACING_X:
         // TODO case wxSYS_ICONSPACING_Y:
         // TODO case wxSYS_WINDOWMIN_X:
         // TODO case wxSYS_WINDOWMIN_Y:

-            
+

         case wxSYS_SCREEN_X:
             wxDisplaySize(&value, NULL);
             return value;
         case wxSYS_SCREEN_Y:
             wxDisplaySize(NULL, &value);
             return value;
         case wxSYS_SCREEN_X:
             wxDisplaySize(&value, NULL);
             return value;
         case wxSYS_SCREEN_Y:
             wxDisplaySize(NULL, &value);
             return value;

-            
+

         // TODO case wxSYS_FRAMESIZE_X:
         // TODO case wxSYS_FRAMESIZE_Y:
         // TODO case wxSYS_SMALLICON_X:
         // TODO case wxSYS_SMALLICON_Y:
         // TODO case wxSYS_FRAMESIZE_X:
         // TODO case wxSYS_FRAMESIZE_Y:
         // TODO case wxSYS_SMALLICON_X:
         // TODO case wxSYS_SMALLICON_Y:

-            
+

         case wxSYS_HSCROLL_Y:
             return 16;
         case wxSYS_VSCROLL_X:
         case wxSYS_HSCROLL_Y:
             return 16;
         case wxSYS_VSCROLL_X:


@@ -209,19 +209,19 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
             return 16;
         case wxSYS_VTHUMB_Y:
             return 16;
             return 16;
         case wxSYS_VTHUMB_Y:
             return 16;

-            
+

         // TODO case wxSYS_CAPTION_Y:
         // TODO case wxSYS_MENU_Y:
         // TODO case wxSYS_NETWORK_PRESENT:
         // TODO case wxSYS_CAPTION_Y:
         // TODO case wxSYS_MENU_Y:
         // TODO case wxSYS_NETWORK_PRESENT:

-            
+

         case wxSYS_PENWINDOWS_PRESENT:
             return 0;
         case wxSYS_PENWINDOWS_PRESENT:
             return 0;

-            
+

         // TODO case wxSYS_SHOW_SOUNDS:
         // TODO case wxSYS_SHOW_SOUNDS:

-            
+

         case wxSYS_SWAP_BUTTONS:
             return 0;
         case wxSYS_SWAP_BUTTONS:
             return 0;

-            
+

         default:
             return -1;  // unsupported metric
     }
         default:
             return -1;  // unsupported metric
     }


@@ -232,11 +232,11 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
 {
     switch (index)
     {
 {
     switch (index)
     {

-        case wxSYS_CAN_ICONIZE_FRAME: 
+        case wxSYS_CAN_ICONIZE_FRAME:

         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:

-            return TRUE;
-            
+            return true;
+

         default:
         default:

-            return FALSE;
+            return false;

     }
 }
     }
 }