make independent from carbon

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

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index ff17ddc967185740cffd79a8dba4bde8a6092b60..7b1596ed2d0b507fef0dcf4d65d21c494f348687 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


@@ -42,16 +41,36 @@ struct wxSystemObjects
              m_colHighlight,
              m_colHighlightText,
              m_colListBox,
              m_colHighlight,
              m_colHighlightText,
              m_colListBox,

+             m_colWindow,
+             m_colWindowText,

              m_colBtnText,
              m_colMenuItemHighlight,
              m_colTooltip,
              m_colBtnText,
              m_colMenuItemHighlight,
              m_colTooltip,

-             m_colTooltipText;
+             m_colTooltipText,
+             m_colMenubarBg;

 
     wxFont m_fontSystem;
 };
 
 static wxSystemObjects gs_objects;
 
 
     wxFont m_fontSystem;
 };
 
 static wxSystemObjects gs_objects;
 

+void wxClearGtkSystemObjects()
+{
+    gs_objects.m_colBtnFace = wxColour();
+    gs_objects.m_colBtnShadow = wxColour();
+    gs_objects.m_colBtnHighlight = wxColour();
+    gs_objects.m_colHighlightText = wxColour();
+    gs_objects.m_colListBox = wxColour();
+    gs_objects.m_colWindow = wxColour();
+    gs_objects.m_colWindowText = wxColour();
+    gs_objects.m_colBtnText = wxColour();
+    gs_objects.m_colMenuItemHighlight = wxColour();
+    gs_objects.m_colTooltip = wxColour();
+    gs_objects.m_colTooltipText = wxColour();
+    gs_objects.m_colMenubarBg = wxColour();
+    gs_objects.m_fontSystem = wxNullFont;
+}
+

 // ----------------------------------------------------------------------------
 // wxSystemSettings implementation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxSystemSettings implementation
 // ----------------------------------------------------------------------------


@@ -61,7 +80,9 @@ enum wxGtkWidgetType
 {
     wxGTK_BUTTON,
     wxGTK_LIST,
 {
     wxGTK_BUTTON,
     wxGTK_LIST,

-    wxGTK_MENUITEM
+    wxGTK_MENUITEM,
+    wxGTK_TEXTCTRL,
+    wxGTK_MENUBAR, 

 };
 
 // the colour we need
 };
 
 // the colour we need


@@ -90,6 +111,10 @@ static bool GetColourFromGTKWidget(GdkColor& gdkColor,
             widget = gtk_button_new();
             break;
 
             widget = gtk_button_new();
             break;
 

+        case wxGTK_TEXTCTRL:
+            widget = gtk_text_view_new();
+            break;
+

         case wxGTK_LIST:
             widget = gtk_tree_view_new_with_model(
                 (GtkTreeModel*)gtk_list_store_new(1, G_TYPE_INT));
         case wxGTK_LIST:
             widget = gtk_tree_view_new_with_model(
                 (GtkTreeModel*)gtk_list_store_new(1, G_TYPE_INT));


@@ -97,6 +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;

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


@@ -134,7 +164,6 @@ static bool GetColourFromGTKWidget(GdkColor& gdkColor,
 static void GetTooltipColors()
 {
     GtkWidget* widget = gtk_window_new(GTK_WINDOW_POPUP);
 static void GetTooltipColors()
 {
     GtkWidget* widget = gtk_window_new(GTK_WINDOW_POPUP);

-    gtk_window_set_type_hint((GtkWindow*)widget, GDK_WINDOW_TYPE_HINT_TOOLTIP);

     const char* name = "gtk-tooltip";
     if (gtk_check_version(2, 11, 0))
         name = "gtk-tooltips";
     const char* name = "gtk-tooltip";
     if (gtk_check_version(2, 11, 0))
         name = "gtk-tooltips";


@@ -163,7 +192,6 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
         case wxSYS_COLOUR_ACTIVEBORDER:
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_BTNFACE:
         case wxSYS_COLOUR_ACTIVEBORDER:
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_BTNFACE:

-        case wxSYS_COLOUR_MENUBAR:

         case wxSYS_COLOUR_3DLIGHT:
             if (!gs_objects.m_colBtnFace.Ok())
             {
         case wxSYS_COLOUR_3DLIGHT:
             if (!gs_objects.m_colBtnFace.Ok())
             {


@@ -177,7 +205,28 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
             break;
 
         case wxSYS_COLOUR_WINDOW:
             break;
 
         case wxSYS_COLOUR_WINDOW:

-            color = *wxWHITE;
+            if (!gs_objects.m_colWindow.Ok())
+            {
+                gdkColor.red =
+                gdkColor.green =
+                gdkColor.blue = 0xFFFF;
+                GetColourFromGTKWidget(gdkColor, wxGTK_TEXTCTRL, GTK_STATE_NORMAL, wxGTK_BASE);
+                gs_objects.m_colWindow = wxColor(gdkColor);
+            }
+            color = gs_objects.m_colWindow;
+            break;
+
+
+        case wxSYS_COLOUR_MENUBAR:
+            if (!gs_objects.m_colMenubarBg.Ok())
+            {
+                gdkColor.red =
+                gdkColor.green = 0;
+                gdkColor.blue = 0x9c40;
+                GetColourFromGTKWidget(gdkColor,wxGTK_MENUBAR);
+                gs_objects.m_colMenubarBg = wxColor(gdkColor);
+            }
+            color = gs_objects.m_colMenubarBg;

             break;
 
         case wxSYS_COLOUR_3DDKSHADOW:
             break;
 
         case wxSYS_COLOUR_3DDKSHADOW:


@@ -365,36 +414,16 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
     return font;
 }
 
     return font;
 }
 

-static bool wxXGetWindowProperty(GdkWindow* window, Atom& type, int& format, gulong& nitems, guchar*& data)
+// 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)

 {
 {

-    bool success = false;
-#if GTK_CHECK_VERSION(2, 2, 0)
-    if (gtk_check_version(2, 2, 0) == NULL)
-    {
-        gulong bytes_after;
-        success = XGetWindowProperty(
-            GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(window)),
-            GDK_WINDOW_XWINDOW(window),
-            gdk_x11_get_xatom_by_name_for_display(
-                gdk_drawable_get_display(window),
-                "_NET_FRAME_EXTENTS"),
-            0, // left, right, top, bottom, CARDINAL[4]/32
-            G_MAXLONG, // size of long
-            false, // do not delete property
-            XA_CARDINAL, // 32 bit
-            &type, &format, &nitems, &bytes_after, &data
-            ) == Success;
-    }
-#endif
-    return success;
+    return window ? gtk_settings_get_for_screen(gdk_drawable_get_screen(window))
+                  : gtk_settings_get_default();

 }
 
 int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
 {
 }
 
 int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
 {

-    guchar *data = NULL;
-    Atom type;
-    int format;
-    gulong nitems;

     GdkWindow *window = NULL;
     if(win && GTK_WIDGET_REALIZED(win->GetHandle()))
         window = win->GetHandle()->window;
     GdkWindow *window = NULL;
     if(win && GTK_WIDGET_REALIZED(win->GetHandle()))
         window = win->GetHandle()->window;


@@ -416,49 +445,21 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
                     return -1; // not a tlw, not sure how to approach
                 else
                 {
                     return -1; // not a tlw, not sure how to approach
                 else
                 {

-                    // Check if wm supports frame extents - we can't know
-                    // the border widths if it does not.
-#if GTK_CHECK_VERSION(2,2,0)
-                    if (!gtk_check_version(2,2,0))
-                    {
-                        if (!gdk_x11_screen_supports_net_wm_hint(
-                                gdk_drawable_get_screen(window),
-                                gdk_atom_intern("_NET_FRAME_EXTENTS", false) ) )
-                            return -1;
-                    }
-                    else
-#endif
-                    {
-                        if (!gdk_net_wm_supports(gdk_atom_intern("_NET_FRAME_EXTENTS", false)))
-                            return -1;
-                    }
-

                     // Get the frame extents from the windowmanager.
                     // In most cases the top extent is the titlebar, so we use the bottom extent
                     // for the heights.
                     // Get the frame extents from the windowmanager.
                     // In most cases the top extent is the titlebar, so we use the bottom extent
                     // for the heights.

-                    if (wxXGetWindowProperty(window, type, format, nitems, data))
+                    int right, bottom;
+                    if (wxGetFrameExtents(window, NULL, &right, NULL, &bottom))

                     {
                     {

-                        int border_return = -1;
-
-                        if ((type == XA_CARDINAL) && (format == 32) && (nitems >= 4) && (data))
+                        switch (index)

                         {
                         {

-                            switch(index)
-                            {
-                                case wxSYS_BORDER_X:
-                                case wxSYS_EDGE_X:
-                                case wxSYS_FRAMESIZE_X:
-                                    border_return = int(data[1]); // width of right extent
-                                    break;
-                                default:
-                                    border_return = int(data[3]); // height of bottom extent
-                                    break;
-                            }
+                            case wxSYS_BORDER_X:
+                            case wxSYS_EDGE_X:
+                            case wxSYS_FRAMESIZE_X:
+                                return right; // width of right extent
+                            default:
+                                return bottom; // height of bottom extent

                         }
                         }

-
-                        if (data)
-                            XFree(data);
-
-                        return border_return;

                     }
                 }
             }
                     }
                 }
             }


@@ -467,49 +468,29 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
 
         case wxSYS_CURSOR_X:
         case wxSYS_CURSOR_Y:
 
         case wxSYS_CURSOR_X:
         case wxSYS_CURSOR_Y:

-#ifdef __WXGTK24__
-            if (!gtk_check_version(2,4,0))
-            {
-                if (window)
-                    return gdk_display_get_default_cursor_size(gdk_drawable_get_display(window));
-                else
-                    return gdk_display_get_default_cursor_size(gdk_display_get_default());
-            }
-            else
-#endif
-                return 16;
+                return gdk_display_get_default_cursor_size(
+                            window ? gdk_drawable_get_display(window)
+                                   : gdk_display_get_default());

 
         case wxSYS_DCLICK_X:
         case wxSYS_DCLICK_Y:
             gint dclick_distance;
 
         case wxSYS_DCLICK_X:
         case wxSYS_DCLICK_Y:
             gint dclick_distance;

-#if GTK_CHECK_VERSION(2,2,0)
-            if (window && !gtk_check_version(2,2,0))
-                g_object_get(gtk_settings_get_for_screen(gdk_drawable_get_screen(window)),
-                                "gtk-double-click-distance", &dclick_distance, NULL);
-            else
-#endif
-                g_object_get(gtk_settings_get_default(),
-                                "gtk-double-click-distance", &dclick_distance, NULL);
+            g_object_get(GetSettingsForWindowScreen(window),
+                            "gtk-double-click-distance", &dclick_distance, NULL);

 
             return dclick_distance * 2;
 
 
             return dclick_distance * 2;
 

+        case wxSYS_DCLICK_MSEC:
+            gint dclick;
+            g_object_get(GetSettingsForWindowScreen(window),
+                            "gtk-double-click-time", &dclick, NULL);
+            return dclick;
+

         case wxSYS_DRAG_X:
         case wxSYS_DRAG_Y:
             gint drag_threshold;
         case wxSYS_DRAG_X:
         case wxSYS_DRAG_Y:
             gint drag_threshold;

-#if GTK_CHECK_VERSION(2,2,0)
-            if (window && !gtk_check_version(2,2,0))
-            {
-                g_object_get(
-                        gtk_settings_get_for_screen(gdk_drawable_get_screen(window)),
-                        "gtk-dnd-drag-threshold",
-                        &drag_threshold, NULL);
-            }
-            else
-#endif
-            {
-                g_object_get(gtk_settings_get_default(),
-                             "gtk-dnd-drag-threshold", &drag_threshold, NULL);
-            }
+            g_object_get(GetSettingsForWindowScreen(window),
+                            "gtk-dnd-drag-threshold", &drag_threshold, NULL);

 
             // The correct thing here would be to double the value
             // since that is what the API wants. But the values
 
             // The correct thing here would be to double the value
             // since that is what the API wants. But the values


@@ -519,50 +500,31 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
 
             return drag_threshold;
 
 
             return drag_threshold;
 

-        // MBN: ditto for icons
-        case wxSYS_ICON_X:     return 32;
-        case wxSYS_ICON_Y:     return 32;
+        case wxSYS_ICON_X:
+        case wxSYS_ICON_Y:
+            return 32;

 
         case wxSYS_SCREEN_X:
 
         case wxSYS_SCREEN_X:

-#if GTK_CHECK_VERSION(2,2,0)
-            if (window && !gtk_check_version(2,2,0))
+            if (window)

                 return gdk_screen_get_width(gdk_drawable_get_screen(window));
             else
                 return gdk_screen_get_width(gdk_drawable_get_screen(window));
             else

-#endif

                 return gdk_screen_width();
 
         case wxSYS_SCREEN_Y:
                 return gdk_screen_width();
 
         case wxSYS_SCREEN_Y:

-#if GTK_CHECK_VERSION(2,2,0)
-            if (window && !gtk_check_version(2,2,0))
+            if (window)

                 return gdk_screen_get_height(gdk_drawable_get_screen(window));
             else
                 return gdk_screen_get_height(gdk_drawable_get_screen(window));
             else

-#endif

                 return gdk_screen_height();
 
                 return gdk_screen_height();
 

-        case wxSYS_HSCROLL_Y:  return 15;
-        case wxSYS_VSCROLL_X:  return 15;
+        case wxSYS_HSCROLL_Y:
+        case wxSYS_VSCROLL_X:
+            return 15;

 
         case wxSYS_CAPTION_Y:
             if (!window)
                 // No realized window specified, and no implementation for that case yet.
                 return -1;
 
 
         case wxSYS_CAPTION_Y:
             if (!window)
                 // No realized window specified, and no implementation for that case yet.
                 return -1;
 

-            // Check if wm supports frame extents - we can't know the caption height if it does not.
-#if GTK_CHECK_VERSION(2,2,0)
-            if (!gtk_check_version(2,2,0))
-            {
-                if (!gdk_x11_screen_supports_net_wm_hint(
-                        gdk_drawable_get_screen(window),
-                        gdk_atom_intern("_NET_FRAME_EXTENTS", false) ) )
-                    return -1;
-            }
-            else
-#endif
-            {
-                if (!gdk_net_wm_supports(gdk_atom_intern("_NET_FRAME_EXTENTS", false)))
-                    return -1;
-            }
-

             wxASSERT_MSG( wxDynamicCast(win, wxTopLevelWindow),
                           wxT("Asking for caption height of a non toplevel window") );
 
             wxASSERT_MSG( wxDynamicCast(win, wxTopLevelWindow),
                           wxT("Asking for caption height of a non toplevel window") );
 


@@ -571,19 +533,12 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
             // we could check which is the thickest wm border to decide on which side the
             // titlebar is, but this might lead to interesting behaviours in used code.
             // Reconsider when we have a way to report to the user on which side it is.
             // we could check which is the thickest wm border to decide on which side the
             // titlebar is, but this might lead to interesting behaviours in used code.
             // Reconsider when we have a way to report to the user on which side it is.

-            if (wxXGetWindowProperty(window, type, format, nitems, data))

             {
             {

-                int caption_height = -1;
-
-                if ((type == XA_CARDINAL) && (format == 32) && (nitems >= 3) && (data))
+                int top;
+                if (wxGetFrameExtents(window, NULL, NULL, &top, NULL))

                 {
                 {

-                    caption_height = int(data[2]); // top frame extent
+                    return top; // top frame extent

                 }
                 }

-
-                if (data)
-                    XFree(data);
-
-                return caption_height;

             }
 
             // Try a default approach without a window pointer, if possible
             }
 
             // Try a default approach without a window pointer, if possible