mac paths updated

[wxWidgets.git] / src / gtk / settings.cpp

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 1be34246f3718deade371388fd3bd27ec62b2bd7..c7f240d747fa00129aa9b5bc10fbdffded4b8436 100644 (file)
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -26,9 +26,8 @@
     #undef GTK_DISABLE_DEPRECATED
 #endif
 #include <gtk/gtk.h>
     #undef GTK_DISABLE_DEPRECATED
 #endif
 #include <gtk/gtk.h>

-#include <gdk/gdkx.h>

 
 

-#include <X11/Xatom.h>
+bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom);

 
 // ----------------------------------------------------------------------------
 // wxSystemObjects
 
 // ----------------------------------------------------------------------------
 // wxSystemObjects


@@ -123,11 +122,11 @@ static bool GetColourFromGTKWidget(GdkColor& gdkColor,
 
         case wxGTK_MENUITEM:
             widget = gtk_menu_item_new();
 
         case wxGTK_MENUITEM:
             widget = gtk_menu_item_new();

-            
+            break;
+

         case wxGTK_MENUBAR:
             widget = gtk_menu_bar_new();
             break;
         case wxGTK_MENUBAR:
             widget = gtk_menu_bar_new();
             break;

-            

     }
 
     GtkStyle *def = gtk_rc_get_style( widget );
     }
 
     GtkStyle *def = gtk_rc_get_style( widget );


@@ -318,11 +317,12 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
         case wxSYS_COLOUR_HIGHLIGHTTEXT:
             if (!gs_objects.m_colHighlightText.Ok())
             {
         case wxSYS_COLOUR_HIGHLIGHTTEXT:
             if (!gs_objects.m_colHighlightText.Ok())
             {

-                wxColour hclr = GetColour(wxSYS_COLOUR_HIGHLIGHT);
-                if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200)
-                    gs_objects.m_colHighlightText = *wxBLACK;
-                else
-                    gs_objects.m_colHighlightText = *wxWHITE;
+                gdkColor.red =
+                gdkColor.green =
+                gdkColor.blue = 0;
+                GetColourFromGTKWidget(
+                    gdkColor, wxGTK_BUTTON, GTK_STATE_SELECTED, wxGTK_FG);
+                gs_objects.m_colHighlightText = wxColour(gdkColor);

             }
             color = gs_objects.m_colHighlightText;
             break;
             }
             color = gs_objects.m_colHighlightText;
             break;


@@ -415,53 +415,6 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
     return font;
 }
 
     return font;
 }
 

-static bool GetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom)
-{
-    bool success = false;
-    Atom property = 0;
-    if (gdk_x11_screen_supports_net_wm_hint(
-            gdk_drawable_get_screen(window),
-            gdk_atom_intern("_NET_FRAME_EXTENTS", false)))
-    {
-        success = true;
-        property = gdk_x11_get_xatom_by_name_for_display(
-            gdk_drawable_get_display(window),
-            "_NET_FRAME_EXTENTS");
-    }
-
-    if (success)
-    {
-        Atom type;
-        int format;
-        gulong nitems, bytes_after;
-        guchar* data;
-        success = XGetWindowProperty(
-            gdk_x11_drawable_get_xdisplay(window),
-            gdk_x11_drawable_get_xid(window),
-            property,
-            0, 4,
-            false,
-            XA_CARDINAL,
-            &type, &format, &nitems, &bytes_after, &data
-            ) == Success;
-        if (success)
-        {
-            success = data && nitems == 4;
-            if (success)
-            {
-                long* p = (long*)data;
-                if (left)   *left   = int(p[0]);
-                if (right)  *right  = int(p[1]);
-                if (top)    *top    = int(p[2]);
-                if (bottom) *bottom = int(p[3]);
-            }
-            if (data)
-                XFree(data);
-        }
-    }
-    return success;
-}
-

 // helper: return the GtkSettings either for the screen the current window is
 // on or for the default screen if window is NULL
 static GtkSettings *GetSettingsForWindowScreen(GdkWindow *window)
 // helper: return the GtkSettings either for the screen the current window is
 // on or for the default screen if window is NULL
 static GtkSettings *GetSettingsForWindowScreen(GdkWindow *window)


@@ -497,7 +450,7 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
                     // In most cases the top extent is the titlebar, so we use the bottom extent
                     // for the heights.
                     int right, bottom;
                     // In most cases the top extent is the titlebar, so we use the bottom extent
                     // for the heights.
                     int right, bottom;

-                    if (GetFrameExtents(window, NULL, &right, NULL, &bottom))
+                    if (wxGetFrameExtents(window, NULL, &right, NULL, &bottom))

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


@@ -583,7 +536,7 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
             // Reconsider when we have a way to report to the user on which side it is.
             {
                 int top;
             // Reconsider when we have a way to report to the user on which side it is.
             {
                 int top;

-                if (GetFrameExtents(window, NULL, NULL, &top, NULL))
+                if (wxGetFrameExtents(window, NULL, NULL, &top, NULL))

                 {
                     return top; // top frame extent
                 }
                 {
                     return top; // top frame extent
                 }