Skip to content

W
wine-winehq
Commit 18eacc6d authored by Zhiyi Zhang's avatar Zhiyi Zhang Committed by Alexandre Julliard
Browse files
Options

uxtheme: Use vssym32.h instead of tmschema.h.

tmschema.h is obsolete and missing some definitions. The deleted global and menu classes are not used anywhere and not in Windows headers. Signed-off-by: 's avatarZhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent f86f0aec
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 87 deletions
dlls/uxtheme/draw.c
View file @ 18eacc6d
......@@ -32,7 +32,7 @@
#include "commoncontrols.h"
#include "vfwmsgs.h"
#include "uxtheme.h"
#include "tmschema.h"
#include "vssym32.h"
#include "msstyles.h"
#include "uxthemedll.h"
......
dlls/uxtheme/metric.c
View file @ 18eacc6d
......@@ -26,7 +26,7 @@
#include "winuser.h"
#include "vfwmsgs.h"
#include "uxtheme.h"
#include "tmschema.h"
#include "vssym32.h"
#include "msstyles.h"
......
dlls/uxtheme/msstyles.c
View file @ 18eacc6d
......@@ -28,7 +28,7 @@
#include "winnls.h"
#include "vfwmsgs.h"
#include "uxtheme.h"
#include "tmschema.h"
#include "vssym32.h"
#include "msstyles.h"
......
dlls/uxtheme/property.c
View file @ 18eacc6d
......@@ -26,7 +26,7 @@
#include "wingdi.h"
#include "vfwmsgs.h"
#include "uxtheme.h"
#include "tmschema.h"
#include "vssym32.h"
#include "msstyles.h"
......
dlls/uxtheme/stylemap.c
View file @ 18eacc6d
......@@ -23,9 +23,10 @@
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "tmschema.h"
#include "vssym32.h"
#define TMT_ENUM 200
#define TMT_STOCKIMAGEFILE 3007
typedef struct _MSSTYLES_PROPERTY_MAP {
WORD dwPrimitiveType;
......@@ -332,24 +333,6 @@ static const MSSTYLES_ENUM_MAP mapEnum[] = {
* Defined as PartID,StateID,TextName
* If StateID == 0 then its a part being defined
*/
/* These are globals to all classes, but its treated as a separate class */
static const MSSTYLES_CLASS_MAP classGlobals[] = {
{GP_BORDER, 0, L"BORDER"},
{GP_BORDER, BSS_FLAT, L"FLAT"},
{GP_BORDER, BSS_RAISED, L"RAISED"},
{GP_BORDER, BSS_SUNKEN, L"SUNKEN"},
{GP_LINEHORZ, 0, L"LINEHORZ"},
{GP_LINEHORZ, LHS_FLAT, L"FLAT"},
{GP_LINEHORZ, LHS_RAISED, L"RAISED"},
{GP_LINEHORZ, LHS_SUNKEN, L"SUNKEN"},
{GP_LINEVERT, 0, L"LINEVERT"},
{GP_LINEVERT, LVS_FLAT, L"FLAT"},
{GP_LINEVERT, LVS_RAISED, L"RAISED"},
{GP_LINEVERT, LVS_SUNKEN, L"SUNKEN"},
{0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classButton[] = {
{BP_PUSHBUTTON, 0, L"PUSHBUTTON"},
{BP_PUSHBUTTON, PBS_NORMAL, L"NORMAL"},
......@@ -488,11 +471,12 @@ static const MSSTYLES_CLASS_MAP classHeader[] = {
static const MSSTYLES_CLASS_MAP classListview[] = {
{LVP_LISTITEM, 0, L"LISTITEM"},
{LVP_LISTITEM, LIS_NORMAL, L"NORMAL"},
{LVP_LISTITEM, LIS_HOT, L"HOT"},
{LVP_LISTITEM, LIS_SELECTED, L"SELECTED"},
{LVP_LISTITEM, LIS_DISABLED, L"DISABLED"},
{LVP_LISTITEM, LIS_SELECTEDNOTFOCUS, L"SELECTEDNOTFOCUS"},
{LVP_LISTITEM, LISS_NORMAL, L"NORMAL"},
{LVP_LISTITEM, LISS_HOT, L"HOT"},
{LVP_LISTITEM, LISS_SELECTED, L"SELECTED"},
{LVP_LISTITEM, LISS_DISABLED, L"DISABLED"},
{LVP_LISTITEM, LISS_SELECTEDNOTFOCUS, L"SELECTEDNOTFOCUS"},
{LVP_LISTITEM, LISS_HOTSELECTED, L"HOTSELECTED"},
{LVP_LISTGROUP, 0, L"LISTGROUP"},
{LVP_LISTDETAIL, 0, L"LISTDETAIL"},
{LVP_LISTSORTEDDETAIL, 0, L"LISTSORTEDDETAIL"},
......@@ -500,34 +484,6 @@ static const MSSTYLES_CLASS_MAP classListview[] = {
{0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classMenu[] = {
{MP_MENUITEM, 0, L"MENUITEM"},
{MP_MENUITEM, MS_NORMAL, L"NORMAL"},
{MP_MENUITEM, MS_SELECTED, L"SELECTED"},
{MP_MENUITEM, MS_DEMOTED, L"DEMOTED"},
{MP_MENUDROPDOWN, 0, L"MENUDROPDOWN"},
{MP_MENUDROPDOWN, MS_NORMAL, L"NORMAL"},
{MP_MENUDROPDOWN, MS_SELECTED, L"SELECTED"},
{MP_MENUDROPDOWN, MS_DEMOTED, L"DEMOTED"},
{MP_MENUBARITEM, 0, L"MENUBARITEM"},
{MP_MENUBARITEM, MS_NORMAL, L"NORMAL"},
{MP_MENUBARITEM, MS_SELECTED, L"SELECTED"},
{MP_MENUBARITEM, MS_DEMOTED, L"DEMOTED"},
{MP_MENUBARDROPDOWN, 0, L"MENUBARDROPDOWN"},
{MP_MENUBARDROPDOWN, MS_NORMAL, L"NORMAL"},
{MP_MENUBARDROPDOWN, MS_SELECTED, L"SELECTED"},
{MP_MENUBARDROPDOWN, MS_DEMOTED, L"DEMOTED"},
{MP_CHEVRON, 0, L"CHEVRON"},
{MP_CHEVRON, MS_NORMAL, L"NORMAL"},
{MP_CHEVRON, MS_SELECTED, L"SELECTED"},
{MP_CHEVRON, MS_DEMOTED, L"DEMOTED"},
{MP_SEPARATOR, 0, L"SEPARATOR"},
{MP_SEPARATOR, MS_NORMAL, L"NORMAL"},
{MP_SEPARATOR, MS_SELECTED, L"SELECTED"},
{MP_SEPARATOR, MS_DEMOTED, L"DEMOTED"},
{0, 0, L""}
};
static const MSSTYLES_CLASS_MAP classMenuband[] = {
{MDP_NEWAPPBUTTON, 0, L"NEWAPPBUTTON"},
{MDP_NEWAPPBUTTON, MDS_NORMAL, L"NORMAL"},
......@@ -1036,7 +992,6 @@ static const MSSTYLES_CLASS_MAP classWindow[] = {
/* Map class names to part/state maps */
static const MSSTYLES_CLASS_NAME mapClass[] = {
{classGlobals, L"GLOBALS"},
{classButton, L"BUTTON"},
{classClock, L"CLOCK"},
{classCombobox, L"COMBOBOX"},
......@@ -1044,7 +999,6 @@ static const MSSTYLES_CLASS_NAME mapClass[] = {
{classExplorerbar, L"EXPLORERBAR"},
{classHeader, L"HEADER"},
{classListview, L"LISTVIEW"},
{classMenu, L"MENU"},
{classMenuband, L"MENUBAND"},
{classPage, L"PAGE"},
{classProgress, L"PROGRESS"},
......
dlls/uxtheme/system.c
View file @ 18eacc6d
......@@ -28,7 +28,7 @@
#include "winreg.h"
#include "vfwmsgs.h"
#include "uxtheme.h"
#include "tmschema.h"
#include "vssym32.h"
#include "uxthemedll.h"
#include "msstyles.h"
......
include/tmschema.h
View file @ 18eacc6d
......@@ -594,34 +594,6 @@ BEGIN_TM_PART_STATES(SPECIALGROUPEXPAND)
TM_STATE(3, EBSGE, PRESSED)
END_TM_PART_STATES()
/* GLOBALS parts */
BEGIN_TM_CLASS_PARTS(GLOBALS)
TM_PART(1, GP, BORDER)
TM_PART(2, GP, LINEHORZ)
TM_PART(3, GP, LINEVERT)
END_TM_CLASS_PARTS()
/* GLOBALS - BORDER states */
BEGIN_TM_PART_STATES(BORDER)
TM_STATE(1, BSS, FLAT)
TM_STATE(2, BSS, RAISED)
TM_STATE(3, BSS, SUNKEN)
END_TM_PART_STATES()
/* GLOBALS - LINEHORZ states */
BEGIN_TM_PART_STATES(LINEHORZ)
TM_STATE(1, LHS, FLAT)
TM_STATE(2, LHS, RAISED)
TM_STATE(3, LHS, SUNKEN)
END_TM_PART_STATES()
/* GLOBAL - LINEVERT states */
BEGIN_TM_PART_STATES(LINEVERT)
TM_STATE(1, LVS, FLAT)
TM_STATE(2, LVS, RAISED)
TM_STATE(3, LVS, SUNKEN)
END_TM_PART_STATES()
/* HEADER parts */
BEGIN_TM_CLASS_PARTS(HEADER)
TM_PART(1, HP, HEADERITEM)
......
include/vsstyle.h
View file @ 18eacc6d
......@@ -1632,6 +1632,13 @@ enum MINBUTTONSTATES {
MINBS_DISABLED = 4,
};
enum MAXBUTTONSTATES {
MAXBS_NORMAL = 1,
MAXBS_HOT = 2,
MAXBS_PUSHED = 3,
MAXBS_DISABLED = 4,
};
enum RESTOREBUTTONSTATES {
RBS_NORMAL = 1,
RBS_HOT = 2,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment