[gtk+: 19/21] Merge branch 'win32-theme2'



commit 4bfa35417b6c7179dc664813ef6fd80a6c53c489
Merge: 1e737bb 88d059f
Author: Alexander Larsson <alexl redhat com>
Date:   Mon Nov 21 13:49:44 2011 +0100

    Merge branch 'win32-theme2'

 gtk/Makefile.am                 |   15 +-
 gtk/gtk-win32.css               |  608 +++++++++++++++++++++++++++++++++++++++
 gtk/gtkborderimage.c            |   46 ++--
 gtk/gtkborderimageprivate.h     |    7 +-
 gtk/gtkcssparser.c              |   13 +-
 gtk/gtkcssprovider.c            |   15 +-
 gtk/gtkentry.c                  |    4 +
 gtk/gtkprogressbar.c            |    1 +
 gtk/gtkrange.c                  |   17 ++
 gtk/gtksettings.c               |    4 +
 gtk/gtkspinbutton.c             |    4 +
 gtk/gtkstylecontext.c           |   18 ++
 gtk/gtkstylecontext.h           |    9 +
 gtk/gtkstylecontextprivate.h    |   10 +
 gtk/gtkstyleproperties.c        |  168 ++++++------
 gtk/gtkstylepropertiesprivate.h |   20 +-
 gtk/gtkstyleproperty.c          |  115 ++++++--
 gtk/gtkstylepropertyprivate.h   |    9 +-
 gtk/gtksymboliccolor.c          |   54 ++++-
 gtk/gtksymboliccolor.h          |    2 +
 gtk/gtkthemingengine.c          |  121 +++++++--
 gtk/gtkthemingengineprivate.h   |    7 +
 gtk/gtkwin32theme.c             |  593 ++++++++++++++++++++++++++++++++++++++
 gtk/gtkwin32themeprivate.h      |   55 ++++
 24 files changed, 1756 insertions(+), 159 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]