Update of /cvsroot/gtk-wimp/gtk-wimp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2736/src
Modified Files:
msw_style.c
Log Message:
gnome bug 316412
Index: msw_style.c
===================================================================
RCS file: /cvsroot/gtk-wimp/gtk-wimp/src/msw_style.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** msw_style.c 27 Jul 2005 18:13:37 -0000 1.29
--- msw_style.c 25 Sep 2005 19:57:54 -0000 1.30
***************
*** 40,43 ****
--- 40,44 ----
#include "gtk/gtk.h"
#include <gdk/gdkwin32.h>
+ /* #include "gdk/win32/gdkwin32.h" */
***************
*** 782,786 ****
sys_color_to_gtk_color(XP_THEME_CLASS_WINDOW, COLOR_WINDOWTEXT, &style->text[GTK_STATE_PRELIGHT]);
! /* Default forgeground */
sys_color_to_gtk_color(XP_THEME_CLASS_BUTTON, COLOR_BTNTEXT, &style->fg[GTK_STATE_NORMAL]);
sys_color_to_gtk_color(XP_THEME_CLASS_TEXT, COLOR_HIGHLIGHTTEXT, &style->fg[GTK_STATE_SELECTED]);
--- 783,787 ----
sys_color_to_gtk_color(XP_THEME_CLASS_WINDOW, COLOR_WINDOWTEXT, &style->text[GTK_STATE_PRELIGHT]);
! /* Default foreground */
sys_color_to_gtk_color(XP_THEME_CLASS_BUTTON, COLOR_BTNTEXT, &style->fg[GTK_STATE_NORMAL]);
sys_color_to_gtk_color(XP_THEME_CLASS_TEXT, COLOR_HIGHLIGHTTEXT, &style->fg[GTK_STATE_SELECTED]);
***************
*** 1724,1745 ****
GtkPositionType gap_side)
{
! if (detail && !strcmp(detail, "tab"))
{
GtkNotebook *notebook = GTK_NOTEBOOK(widget);
! GtkPositionType pos_type = gtk_notebook_get_tab_pos(notebook);
! gint x2, y2, w2, h2;
! x2 = x; y2 = y; w2 = width; h2 = height;
! if (pos_type == GTK_POS_TOP && state_type == GTK_STATE_NORMAL) {
/*h2 += XP_EDGE_SIZE;*/
}
! else if (pos_type == GTK_POS_BOTTOM && state_type == GTK_STATE_NORMAL) {
/*h2 += XP_EDGE_SIZE;*/
}
! else if (pos_type == GTK_POS_LEFT && state_type == GTK_STATE_NORMAL) {
x2 += 1;
w2 -= XP_EDGE_SIZE;
}
! else if (pos_type == GTK_POS_RIGHT && state_type == GTK_STATE_NORMAL) {
w2 -= (XP_EDGE_SIZE + 1);
}
--- 1725,1745 ----
GtkPositionType gap_side)
{
! if (GTK_IS_NOTEBOOK(widget) && detail && !strcmp(detail, "tab"))
{
GtkNotebook *notebook = GTK_NOTEBOOK(widget);
! gint x2, y2, w2, h2;
! x2 = x; y2 = y; w2 = width; h2 = height;
! if (gap_side == GTK_POS_TOP && state_type == GTK_STATE_NORMAL) {
/*h2 += XP_EDGE_SIZE;*/
}
! else if (gap_side == GTK_POS_BOTTOM && state_type == GTK_STATE_NORMAL) {
/*h2 += XP_EDGE_SIZE;*/
}
! else if (gap_side == GTK_POS_LEFT && state_type == GTK_STATE_NORMAL) {
x2 += 1;
w2 -= XP_EDGE_SIZE;
}
! else if (gap_side == GTK_POS_RIGHT && state_type == GTK_STATE_NORMAL) {
w2 -= (XP_EDGE_SIZE + 1);
}
***************
*** 1766,1775 ****
gint gap_x, gint gap_width)
{
! if (detail && !strcmp(detail, "notebook"))
{
- GtkNotebook *notebook = GTK_NOTEBOOK(widget);
-
/* FIXME: pos != TOP to be implemented */
! if (gtk_notebook_get_tab_pos(notebook) == GTK_POS_TOP && xp_theme_draw(window, XP_THEME_ELEMENT_TAB_PANE, style, x, y, width, height,
state_type, area))
{
--- 1766,1773 ----
gint gap_x, gint gap_width)
{
! if (GTK_IS_NOTEBOOK(widget) && detail && !strcmp(detail, "notebook"))
{
/* FIXME: pos != TOP to be implemented */
! if (gap_side == GTK_POS_TOP && xp_theme_draw(window, XP_THEME_ELEMENT_TAB_PANE, style, x, y, width, height,
state_type, area))
{
|
