X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afeb58f16b8b087994a7fabb4eca3a3c10225137..2121eb69fa8d49f4484f7170159e61f2e8885de4:/src/gtk/settings.cpp diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index a7ed537f03..1aa49645b0 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/settings.cpp +// Name: src/gtk/settings.cpp // Purpose: // Author: Robert Roebling // Modified by: Mart Raudsepp (GetMetric) @@ -12,10 +12,13 @@ #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 @@ -131,11 +134,11 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue, green = col[state].green; blue = col[state].blue; - ok = TRUE; + ok = true; } else { - ok = FALSE; + ok = false; } gtk_widget_destroy( widget ); @@ -530,7 +533,13 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) "gtk-dnd-drag-threshold", &drag_threshold, NULL); } - return drag_threshold * 2; + // 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; @@ -642,12 +651,12 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index) switch (index) { case wxSYS_CAN_ICONIZE_FRAME: - return FALSE; + return false; case wxSYS_CAN_DRAW_FRAME_DECORATIONS: - return TRUE; + return true; default: - return FALSE; + return false; } }