LLVM doesn't support multiplication in rc macros
This commit is contained in:
@@ -3,6 +3,8 @@
|
||||
#define CFG_BTN_WIDTH 46
|
||||
#define CFG_BTN_HEIGHT 14
|
||||
#define CFG_PANE_LTEXT_PRI_WIDTH 85
|
||||
#define CFG_PANE_LTEXT_PRI_WIDTH_2 170
|
||||
#define CFG_PANE_LTEXT_PRI_WIDTH_3 255
|
||||
#define CFG_PANE_LTEXT_HEIGHT 10
|
||||
#define CFG_COMBO_BTN_WIDTH 212
|
||||
#define CFG_COMBO_NOBTN_WIDTH CFG_COMBO_BTN_WIDTH + CFG_BTN_WIDTH + 8
|
||||
@@ -405,7 +407,7 @@ BEGIN
|
||||
LTEXT STR_PCAP, IDT_PCAP,
|
||||
CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH - 10, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
|
||||
LTEXT STR_NET, IDT_NET,
|
||||
CFG_HMARGIN + (CFG_PANE_LTEXT_PRI_WIDTH * 2) + 20, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
|
||||
CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH_2 + 20, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
|
||||
|
||||
COMBOBOX IDC_COMBO_NET1_TYPE,
|
||||
CFG_HMARGIN, 28, 48, CFG_COMBO_HEIGHT,
|
||||
@@ -416,10 +418,10 @@ BEGIN
|
||||
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
|
||||
COMBOBOX IDC_COMBO_NET1,
|
||||
CFG_HMARGIN + (CFG_PANE_LTEXT_PRI_WIDTH * 2) + 20, 28, 110, CFG_COMBO_HEIGHT,
|
||||
CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH_2 + 20, 28, 110, CFG_COMBO_HEIGHT,
|
||||
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_NET1,
|
||||
CFG_HMARGIN + (CFG_PANE_LTEXT_PRI_WIDTH * 3) + 50, 27, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
|
||||
CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH_3 + 50, 27, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
|
||||
|
||||
COMBOBOX IDC_COMBO_NET2_TYPE,
|
||||
CFG_HMARGIN, 49, 48, CFG_COMBO_HEIGHT,
|
||||
@@ -430,10 +432,10 @@ BEGIN
|
||||
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
|
||||
COMBOBOX IDC_COMBO_NET2,
|
||||
CFG_HMARGIN + (CFG_PANE_LTEXT_PRI_WIDTH * 2) + 20, 49, 110, CFG_COMBO_HEIGHT,
|
||||
CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH_2 + 20, 49, 110, CFG_COMBO_HEIGHT,
|
||||
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_NET2,
|
||||
CFG_HMARGIN + (CFG_PANE_LTEXT_PRI_WIDTH * 3) + 50, 48, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
|
||||
CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH_3 + 50, 48, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
|
||||
|
||||
COMBOBOX IDC_COMBO_NET3_TYPE,
|
||||
CFG_HMARGIN, 70, 48, CFG_COMBO_HEIGHT,
|
||||
@@ -444,10 +446,10 @@ BEGIN
|
||||
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
|
||||
COMBOBOX IDC_COMBO_NET3,
|
||||
CFG_HMARGIN + (CFG_PANE_LTEXT_PRI_WIDTH * 2) + 20, 70, 110, CFG_COMBO_HEIGHT,
|
||||
CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH_2 + 20, 70, 110, CFG_COMBO_HEIGHT,
|
||||
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_NET3,
|
||||
CFG_HMARGIN + (CFG_PANE_LTEXT_PRI_WIDTH * 3) + 50, 69, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
|
||||
CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH_3 + 50, 69, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
|
||||
|
||||
COMBOBOX IDC_COMBO_NET4_TYPE,
|
||||
CFG_HMARGIN, 91, 48, CFG_COMBO_HEIGHT,
|
||||
@@ -458,10 +460,10 @@ BEGIN
|
||||
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
|
||||
COMBOBOX IDC_COMBO_NET4,
|
||||
CFG_HMARGIN + (CFG_PANE_LTEXT_PRI_WIDTH * 2) + 20, 91, 110, CFG_COMBO_HEIGHT,
|
||||
CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH_2 + 20, 91, 110, CFG_COMBO_HEIGHT,
|
||||
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
PUSHBUTTON STR_CONFIGURE, IDC_CONFIGURE_NET4,
|
||||
CFG_HMARGIN + (CFG_PANE_LTEXT_PRI_WIDTH * 3) + 50, 90, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
|
||||
CFG_HMARGIN + CFG_PANE_LTEXT_PRI_WIDTH_3 + 50, 90, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
|
||||
|
||||
END
|
||||
|
||||
|
Reference in New Issue
Block a user