/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/settings.cpp
+// Name: src/gtk/settings.cpp
// Purpose:
// Author: Robert Roebling
// Modified by: Mart Raudsepp (GetMetric)
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "settings.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/settings.h"
-#include "wx/debug.h"
-#include "wx/cmndata.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/cmndata.h"
+ #include "wx/toplevel.h"
+#endif
+
#include "wx/fontutil.h"
-#include "wx/toplevel.h"
+
+// Using gtk_list_new, which is deprecated since GTK2
+// Using gtk_object_sink, which is deprecated since GTK+-2.9.0
+#ifdef GTK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+#endif
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
m_colHighlightText,
m_colListBox,
m_colBtnText,
- m_colMenuItemHighlight;
+ m_colMenuItemHighlight,
+ m_colTooltip,
+ m_colTooltipText;
wxFont m_fontSystem;
};
case wxGTK_LIST:
widget = gtk_list_new();
-
+ break;
+
case wxGTK_MENUITEM:
widget = gtk_menu_item_new();
}
green = col[state].green;
blue = col[state].blue;
- ok = TRUE;
+ ok = true;
}
else
{
- ok = FALSE;
+ ok = false;
}
gtk_widget_destroy( widget );
return ok;
}
+static void GetTooltipColors()
+{
+ GtkTooltips* tooltips = gtk_tooltips_new();
+ gtk_tooltips_force_window(tooltips);
+ gtk_widget_ensure_style(tooltips->tip_window);
+ GdkColor c = tooltips->tip_window->style->bg[GTK_STATE_NORMAL];
+ gs_objects.m_colTooltip = wxColor(c.red >> SHIFT, c.green >> SHIFT, c.blue >> SHIFT);
+ c = tooltips->tip_window->style->fg[GTK_STATE_NORMAL];
+ gs_objects.m_colTooltipText = wxColor(c.red >> SHIFT, c.green >> SHIFT, c.blue >> SHIFT);
+ gtk_object_sink(wx_reinterpret_cast(GtkObject*, tooltips));
+}
+
wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
{
switch (index)
case wxSYS_COLOUR_CAPTIONTEXT:
case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
case wxSYS_COLOUR_BTNTEXT:
- case wxSYS_COLOUR_INFOTEXT:
if (!gs_objects.m_colBtnText.Ok())
{
int red, green, blue;
}
return gs_objects.m_colBtnText;
- // this (as well as wxSYS_COLOUR_INFOTEXT above) is used for
- // tooltip windows - Robert, please change this code to use the
- // real GTK tooltips when/if you can (TODO)
case wxSYS_COLOUR_INFOBK:
- return wxColour(255, 255, 225);
+ if (!gs_objects.m_colTooltip.Ok()) {
+ GetTooltipColors();
+ }
+ return gs_objects.m_colTooltip;
+
+ case wxSYS_COLOUR_INFOTEXT:
+ if (!gs_objects.m_colTooltipText.Ok()) {
+ GetTooltipColors();
+ }
+ return gs_objects.m_colTooltipText;
case wxSYS_COLOUR_HIGHLIGHTTEXT:
if (!gs_objects.m_colHighlightText.Ok())
case wxSYS_COLOUR_MAX:
default:
wxFAIL_MSG( _T("unknown system colour index") );
- }
+ }
- return *wxWHITE;
+ return *wxWHITE;
}
wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
{
if (!gs_objects.m_fontSystem.Ok())
{
-#ifdef __WXGTK20__
GtkWidget *widget = gtk_button_new();
GtkStyle *def = gtk_rc_get_style( widget );
if ( !def || !def->font_desc )
- def = gtk_widget_get_default_style();
+ def = gtk_widget_get_default_style();
if ( def && def->font_desc )
- {
- wxNativeFontInfo info;
- info.description =
+ {
+ wxNativeFontInfo info;
+ info.description =
pango_font_description_copy(def->font_desc);
- gs_objects.m_fontSystem = wxFont(info);
- }
- else
- {
+ gs_objects.m_fontSystem = wxFont(info);
+ }
+ else
+ {
GtkSettings *settings = gtk_settings_get_default();
gchar *font_name = NULL;
g_object_get ( settings,
- "gtk-font-name",
+ "gtk-font-name",
&font_name,
NULL);
if (!font_name)
else
gs_objects.m_fontSystem = wxFont(wxString::FromAscii(font_name));
g_free (font_name);
- }
+ }
gtk_widget_destroy( widget );
-#else
- gs_objects.m_fontSystem = wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
-#endif
}
return gs_objects.m_fontSystem;
}
int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
{
-#ifdef __WXGTK20__
+ bool success = false;
+
guchar *data = NULL;
GdkWindow *window = NULL;
if(win && GTK_WIDGET_REALIZED(win->GetHandle()))
window = win->GetHandle()->window;
-#endif
switch (index)
{
-#ifdef __WXGTK20__
case wxSYS_BORDER_X:
case wxSYS_BORDER_Y:
case wxSYS_EDGE_X:
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.
-
+
Atom type;
gint format;
gulong nitems;
- gulong bytes_after;
-
- if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(window)),
+
+#if GTK_CHECK_VERSION(2,2,0)
+ if (!gtk_check_version(2,2,0))
+ {
+ 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),
false, // do not delete property
XA_CARDINAL, // 32 bit
&type, &format, &nitems, &bytes_after, &data
- ) == Success)
+ ) == Success);
+ }
+#endif
+ if (success)
{
int border_return = -1;
}
return -1; // no window specified
-#endif // gtk2
case wxSYS_CURSOR_X:
case wxSYS_CURSOR_Y:
#endif
return 16;
-#ifdef __WXGTK20__
case wxSYS_DCLICK_X:
case wxSYS_DCLICK_Y:
gint dclick_distance;
"gtk-double-click-distance", &dclick_distance, NULL);
return dclick_distance * 2;
-#endif // gtk2
-#ifdef __WXGTK20__
case wxSYS_DRAG_X:
case wxSYS_DRAG_Y:
gint drag_threshold;
"gtk-dnd-drag-threshold", &drag_threshold, NULL);
}
- return drag_threshold * 2;
-#endif
+ // The correct thing here would be to double the value
+ // since that is what the API wants. But the values
+ // are much bigger under GNOME than under Windows and
+ // just seem to much in many cases to be useful.
+ // drag_threshold *= 2;
+
+ return drag_threshold;
// MBN: ditto for icons
case wxSYS_ICON_X: return 32;
case wxSYS_ICON_Y: return 32;
case wxSYS_SCREEN_X:
-#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,2,0)
+#if GTK_CHECK_VERSION(2,2,0)
if (window && !gtk_check_version(2,2,0))
return gdk_screen_get_width(gdk_drawable_get_screen(window));
else
return gdk_screen_width();
case wxSYS_SCREEN_Y:
-#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,2,0)
+#if GTK_CHECK_VERSION(2,2,0)
if (window && !gtk_check_version(2,2,0))
return gdk_screen_get_height(gdk_drawable_get_screen(window));
else
case wxSYS_HSCROLL_Y: return 15;
case wxSYS_VSCROLL_X: return 15;
-// a gtk1 implementation should be possible too if gtk2 efficiency/convenience functions aren't used
-#ifdef __WXGTK20__
case wxSYS_CAPTION_Y:
if (!window)
// No realized window specified, and no implementation for that case yet.
Atom type;
gint format;
gulong nitems;
- gulong bytes_after;
- if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(window)),
+#if GTK_CHECK_VERSION(2,2,0)
+ if (!gtk_check_version(2,2,0))
+ {
+ 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),
false, // do not delete property
XA_CARDINAL, // 32 bit
&type, &format, &nitems, &bytes_after, &data
- ) == Success)
+ ) == Success);
+ }
+#endif
+ if (success)
{
int caption_height = -1;
// ...
return -1;
-#endif // gtk2
case wxSYS_PENWINDOWS_PRESENT:
// No MS Windows for Pen computing extension available in X11 based gtk+.
{
switch (index)
{
- case wxSYS_CAN_ICONIZE_FRAME:
- return FALSE;
- break;
+ case wxSYS_CAN_ICONIZE_FRAME:
+ return false;
+
case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
- return TRUE;
- break;
+ return true;
+
default:
- return FALSE;
+ return false;
}
}
projects / wxWidgets.git / blobdiff