Skip to content

V
vlc
Commit 4a7bb539 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: remove the legacy CONFIG_ITEM_KEY_BEFORE_10_3 code

parent 03c6d5b8
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 71 deletions
modules/gui/macosx/prefs_widgets.h
View file @ 4a7bb539
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#define CONFIG_ITEM_STRING_LIST (CONFIG_ITEM_STRING + 1) #define CONFIG_ITEM_STRING_LIST (CONFIG_ITEM_STRING + 1)
#define CONFIG_ITEM_RANGED_INTEGER (CONFIG_ITEM_INTEGER + 1) #define CONFIG_ITEM_RANGED_INTEGER (CONFIG_ITEM_INTEGER + 1)
#define CONFIG_ITEM_KEY_BEFORE_10_3 (CONFIG_ITEM_KEY + 1)
#define CONFIG_ITEM_KEY_AFTER_10_3 (CONFIG_ITEM_KEY + 2) #define CONFIG_ITEM_KEY_AFTER_10_3 (CONFIG_ITEM_KEY + 2)
#define LEFTMARGIN 18 #define LEFTMARGIN 18
#define RIGHTMARGIN 18 #define RIGHTMARGIN 18
...@@ -207,6 +206,5 @@ static NSMenu *o_keys_menu = nil; ...@@ -207,6 +206,5 @@ static NSMenu *o_keys_menu = nil;
//#undef CONFIG_ITEM_LIST_STRING //#undef CONFIG_ITEM_LIST_STRING
//#undef CONFIG_ITEM_RANGED_INTEGER //#undef CONFIG_ITEM_RANGED_INTEGER
//#undef CONFIG_ITEM_KEY_BEFORE_10_3
//#undef CONFIG_ITEM_KEY_AFTER_10_3 //#undef CONFIG_ITEM_KEY_AFTER_10_3
modules/gui/macosx/prefs_widgets.m
View file @ 4a7bb539
...@@ -467,9 +467,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ ...@@ -467,9 +467,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
case CONFIG_ITEM_BOOL: case CONFIG_ITEM_BOOL:
i_margin = 7; i_margin = 7;
break; break;
case CONFIG_ITEM_KEY_BEFORE_10_3:
i_margin = 7;
break;
case CONFIG_ITEM_KEY_AFTER_10_3: case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 6; i_margin = 6;
break; break;
...@@ -505,9 +502,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ ...@@ -505,9 +502,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
case CONFIG_ITEM_BOOL: case CONFIG_ITEM_BOOL:
i_margin = 7; i_margin = 7;
break; break;
case CONFIG_ITEM_KEY_BEFORE_10_3:
i_margin = 7;
break;
case CONFIG_ITEM_KEY_AFTER_10_3: case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 6; i_margin = 6;
break; break;
...@@ -544,9 +538,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ ...@@ -544,9 +538,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
case CONFIG_ITEM_BOOL: case CONFIG_ITEM_BOOL:
i_margin = 7; i_margin = 7;
break; break;
case CONFIG_ITEM_KEY_BEFORE_10_3:
i_margin = 7;
break;
case CONFIG_ITEM_KEY_AFTER_10_3: case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 6; i_margin = 6;
break; break;
...@@ -583,9 +574,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ ...@@ -583,9 +574,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
case CONFIG_ITEM_BOOL: case CONFIG_ITEM_BOOL:
i_margin = 10; i_margin = 10;
break; break;
case CONFIG_ITEM_KEY_BEFORE_10_3:
i_margin = 10;
break;
case CONFIG_ITEM_KEY_AFTER_10_3: case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 9; i_margin = 9;
break; break;
...@@ -622,9 +610,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ ...@@ -622,9 +610,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
case CONFIG_ITEM_BOOL: case CONFIG_ITEM_BOOL:
i_margin = 8; i_margin = 8;
break; break;
case CONFIG_ITEM_KEY_BEFORE_10_3:
i_margin = 8;
break;
case CONFIG_ITEM_KEY_AFTER_10_3: case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 7; i_margin = 7;
break; break;
...@@ -661,9 +646,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ ...@@ -661,9 +646,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
case CONFIG_ITEM_BOOL: case CONFIG_ITEM_BOOL:
i_margin = 7; i_margin = 7;
break; break;
case CONFIG_ITEM_KEY_BEFORE_10_3:
i_margin = 7;
break;
case CONFIG_ITEM_KEY_AFTER_10_3: case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 6; i_margin = 6;
break; break;
...@@ -700,9 +682,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ ...@@ -700,9 +682,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
case CONFIG_ITEM_BOOL: case CONFIG_ITEM_BOOL:
i_margin = 7; i_margin = 7;
break; break;
case CONFIG_ITEM_KEY_BEFORE_10_3:
i_margin = 7;
break;
case CONFIG_ITEM_KEY_AFTER_10_3: case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 6; i_margin = 6;
break; break;
...@@ -739,9 +718,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ ...@@ -739,9 +718,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
case CONFIG_ITEM_BOOL: case CONFIG_ITEM_BOOL:
i_margin = 7; i_margin = 7;
break; break;
case CONFIG_ITEM_KEY_BEFORE_10_3:
i_margin = 7;
break;
case CONFIG_ITEM_KEY_AFTER_10_3: case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 5; i_margin = 5;
break; break;
...@@ -753,45 +729,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ ...@@ -753,45 +729,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
break; break;
} }
break; break;
case CONFIG_ITEM_KEY_BEFORE_10_3:
switch( i_lastItem )
{
case CONFIG_ITEM_STRING:
case CONFIG_ITEM_PASSWORD:
i_margin = 6;
break;
case CONFIG_ITEM_STRING_LIST:
i_margin = 5;
break;
case CONFIG_ITEM_FILE:
i_margin = 4;
break;
case CONFIG_ITEM_MODULE:
i_margin = 2;
break;
case CONFIG_ITEM_INTEGER:
i_margin = 5;
break;
case CONFIG_ITEM_RANGED_INTEGER:
i_margin = 3;
break;
case CONFIG_ITEM_BOOL:
i_margin = 3;
break;
case CONFIG_ITEM_KEY_BEFORE_10_3:
i_margin = 10;
break;
case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 6;
break;
case CONFIG_ITEM_MODULE_LIST:
i_margin = 6;
break;
default:
i_margin = 18;
break;
}
break;
case CONFIG_ITEM_KEY_AFTER_10_3: case CONFIG_ITEM_KEY_AFTER_10_3:
switch( i_lastItem ) switch( i_lastItem )
{ {
...@@ -817,9 +754,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ ...@@ -817,9 +754,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
case CONFIG_ITEM_BOOL: case CONFIG_ITEM_BOOL:
i_margin = 7; i_margin = 7;
break; break;
case CONFIG_ITEM_KEY_BEFORE_10_3:
i_margin = 7;
break;
case CONFIG_ITEM_KEY_AFTER_10_3: case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 8; i_margin = 8;
break; break;
...@@ -856,9 +790,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ ...@@ -856,9 +790,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
case CONFIG_ITEM_BOOL: case CONFIG_ITEM_BOOL:
i_margin = 7; i_margin = 7;
break; break;
case CONFIG_ITEM_KEY_BEFORE_10_3:
i_margin = 7;
break;
case CONFIG_ITEM_KEY_AFTER_10_3: case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 5; i_margin = 5;
break; break;
......
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