Various fixes for Textctrl and Popup Menus.

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

diff --git a/src/mac/carbon/settings.cpp b/src/mac/carbon/settings.cpp
index b272f5f5dd59c8c1ccd2a9ac533929563d682aee..8c7591cfdbd2d7a2c7fbb13a812c6fee83887ed8 100644 (file)
--- a/src/mac/carbon/settings.cpp
+++ b/src/mac/carbon/settings.cpp
@@ -17,7 +17,17 @@
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
 
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
 

-wxColour wxSystemSettings::GetSystemColour(int index)
+#include "wx/mac/uma.h"
+
+// ----------------------------------------------------------------------------
+// wxSystemSettingsNative
+// ----------------------------------------------------------------------------
+
+// ----------------------------------------------------------------------------
+// colours
+// ----------------------------------------------------------------------------
+
+wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)

 {
     int major,minor;
     wxGetOsVersion( &major, &minor );
 {
     int major,minor;
     wxGetOsVersion( &major, &minor );


@@ -93,7 +103,11 @@ wxColour wxSystemSettings::GetSystemColour(int index)
     return *wxWHITE;
 }
 
     return *wxWHITE;
 }
 

-wxFont wxSystemSettings::GetSystemFont(int index)
+// ----------------------------------------------------------------------------
+// fonts
+// ----------------------------------------------------------------------------
+
+wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)

 {
     switch (index)
     {
 {
     switch (index)
     {


@@ -118,8 +132,12 @@ wxFont wxSystemSettings::GetSystemFont(int index)
     return *wxNORMAL_FONT;
 }
 
     return *wxNORMAL_FONT;
 }
 

+// ----------------------------------------------------------------------------
+// system metrics/features
+// ----------------------------------------------------------------------------
+

 // Get a system metric, e.g. scrollbar size
 // Get a system metric, e.g. scrollbar size

-int wxSystemSettings::GetSystemMetric(int index)
+int wxSystemSettingsNative::GetMetric(wxSystemMetric index)

 {
     switch ( index)
     {
 {
     switch ( index)
     {


@@ -156,11 +174,11 @@ int wxSystemSettings::GetSystemMetric(int index)
             // TODO
             return 0;
         case wxSYS_HSCROLL_ARROW_X:
             // TODO
             return 0;
         case wxSYS_HSCROLL_ARROW_X:

-                    return 16;
+            return 16;

         case wxSYS_HSCROLL_ARROW_Y:
         case wxSYS_HSCROLL_ARROW_Y:

-                    return 16;
+            return 16;

         case wxSYS_HTHUMB_X:
         case wxSYS_HTHUMB_X:

-                    return 16;
+            return 16;

         case wxSYS_ICON_X:
             // TODO
             return 0;
         case wxSYS_ICON_X:
             // TODO
             return 0;


@@ -198,44 +216,45 @@ int wxSystemSettings::GetSystemMetric(int index)
             // TODO
             return 0;
         case wxSYS_HSCROLL_Y:
             // TODO
             return 0;
         case wxSYS_HSCROLL_Y:

-                    return 16;
+            return 16;

         case wxSYS_VSCROLL_X:
         case wxSYS_VSCROLL_X:

-                    return 16;
+            return 16;

         case wxSYS_VSCROLL_ARROW_X:
         case wxSYS_VSCROLL_ARROW_X:

-                    return 16;
+            return 16;

         case wxSYS_VSCROLL_ARROW_Y:
         case wxSYS_VSCROLL_ARROW_Y:

-                    return 16;
+            return 16;

         case wxSYS_VTHUMB_Y:
         case wxSYS_VTHUMB_Y:

-                    return 16;
+            return 16;

         case wxSYS_CAPTION_Y:
             // TODO
         case wxSYS_CAPTION_Y:
             // TODO

-                    return 0;
+            return 0;

         case wxSYS_MENU_Y:
             // TODO
         case wxSYS_MENU_Y:
             // TODO

-                    return 0;
+            return 0;

         case wxSYS_NETWORK_PRESENT:
             // TODO
         case wxSYS_NETWORK_PRESENT:
             // TODO

-                    return 0;
+            return 0;

         case wxSYS_PENWINDOWS_PRESENT:
         case wxSYS_PENWINDOWS_PRESENT:

-                    return 0;
+            return 0;

         case wxSYS_SHOW_SOUNDS:
             // TODO
             return 0;
         case wxSYS_SWAP_BUTTONS:
         case wxSYS_SHOW_SOUNDS:
             // TODO
             return 0;
         case wxSYS_SWAP_BUTTONS:

-                return 0;
-            default:
-                return 0;
+            return 0;
+        default:
+            return 0;

     }
     return 0;
 }
 
     }
     return 0;
 }
 

-bool wxSystemSettings::GetCapability(int index)
+bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)

 {
     switch (index)
     {
         case wxSYS_CAN_ICONIZE_FRAME: 
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
 {
     switch (index)
     {
         case wxSYS_CAN_ICONIZE_FRAME: 
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:

-            return TRUE; break;
+            return TRUE;
+            

         default:
             return FALSE;
     }
         default:
             return FALSE;
     }