diff options
author | Benjamin Otte <otte@redhat.com> | 2016-02-17 02:43:18 +0100 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2016-02-17 04:36:18 +0100 |
commit | 37e3ccb2f67729ecdef6605455e6bf2b8b0279d7 (patch) | |
tree | dbcd6950a393cf775517b9d4b299f7fa90336afb /gtk/gtkwin32theme.c | |
parent | 3e5be58991ce62e3c31f3a2a5bafc59abb3820a2 (diff) | |
download | gtk+-37e3ccb2f67729ecdef6605455e6bf2b8b0279d7.tar.gz |
win32: Split out fallback code into separate file
(1) Actual Windows users don't care about it
(2) It's easier to get rid of
Diffstat (limited to 'gtk/gtkwin32theme.c')
-rw-r--r-- | gtk/gtkwin32theme.c | 46 |
1 files changed, 3 insertions, 43 deletions
diff --git a/gtk/gtkwin32theme.c b/gtk/gtkwin32theme.c index f933ac2dfc..8288f5d94d 100644 --- a/gtk/gtkwin32theme.c +++ b/gtk/gtkwin32theme.c @@ -23,6 +23,8 @@ #include "gtkwin32themeprivate.h" +#include "gtkwin32drawprivate.h" + #ifdef G_OS_WIN32 #include <windows.h> @@ -455,45 +457,6 @@ gtk_win32_theme_get_size (GtkWin32Theme *theme, #endif } -struct { - const char *name; - GdkRGBA rgba; -} win32_default_colors[] = { -#define RGB(r, g, b) { (r)/255.0, (g)/255.0, (b)/255., 1.0 } - { "scrollbar", RGB(212, 208, 200) }, - { "background", RGB(58, 110, 165) }, - { "activecaption", RGB(10, 36, 106) }, - { "inactivecaption", RGB(128, 128, 128) }, - { "menu", RGB(212, 208, 200) }, - { "window", RGB(255, 255, 255) }, - { "windowframe", RGB(0, 0, 0) }, - { "menutext", RGB(0, 0, 0) }, - { "windowtext", RGB(0, 0, 0) }, - { "captiontext", RGB(255, 255, 255) }, - { "activeborder", RGB(212, 208, 200) }, - { "inactiveborder", RGB(212, 208, 200) }, - { "appworkspace", RGB(128, 128, 128) }, - { "highlight", RGB(10, 36, 106) }, - { "highlighttext", RGB(255, 255, 255) }, - { "btnface", RGB(212, 208, 200) }, - { "btnshadow", RGB(128, 128, 128) }, - { "graytext", RGB(128, 128, 128) }, - { "btntext", RGB(0, 0, 0) }, - { "inactivecaptiontext", RGB(212, 208, 200) }, - { "btnhighlight", RGB(255, 255, 255) }, - { "3ddkshadow", RGB(64, 64, 64) }, - { "3dlight", RGB(212, 208, 200) }, - { "infotext", RGB(0, 0, 0) }, - { "infobk", RGB(255, 255, 225) }, - { "alternatebtnface", RGB(181, 181, 181) }, - { "hotlight", RGB(0, 0, 200) }, - { "gradientactivecaption", RGB(166, 202, 240) }, - { "gradientinactivecaption", RGB(192, 192, 192) }, - { "menuhilight", RGB(10, 36, 106) }, - { "menubar", RGB(212, 208, 200) } -#undef RGB -}; - void gtk_win32_theme_get_color (GtkWin32Theme *theme, gint id, @@ -518,10 +481,7 @@ gtk_win32_theme_get_color (GtkWin32Theme *theme, color->green = GetGValue (dcolor) / 255.0; color->blue = GetBValue (dcolor) / 255.0; #else - if (id < G_N_ELEMENTS (win32_default_colors)) - *color = win32_default_colors[id].rgba; - else - gdk_rgba_parse (color, "black"); + gtk_win32_get_sys_color (id, color); #endif } |