[vlc-devel] commit: macosx: remove the legacy CONFIG_ITEM_KEY_BEFORE_10_3 code ( Felix Paul Kühne )
git version control
git at videolan.org
Thu Sep 25 16:36:30 CEST 2008
vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Sep 25 16:39:59 2008 +0200| [4a7bb5396d9165e40df32899f13321e7781f5d0d] | committer: Felix Paul Kühne
macosx: remove the legacy CONFIG_ITEM_KEY_BEFORE_10_3 code
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4a7bb5396d9165e40df32899f13321e7781f5d0d
---
modules/gui/macosx/prefs_widgets.h | 2 -
modules/gui/macosx/prefs_widgets.m | 69 ------------------------------------
2 files changed, 0 insertions(+), 71 deletions(-)
diff --git a/modules/gui/macosx/prefs_widgets.h b/modules/gui/macosx/prefs_widgets.h
index d186887..ef55cec 100644
--- a/modules/gui/macosx/prefs_widgets.h
+++ b/modules/gui/macosx/prefs_widgets.h
@@ -23,7 +23,6 @@
#define CONFIG_ITEM_STRING_LIST (CONFIG_ITEM_STRING + 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 LEFTMARGIN 18
#define RIGHTMARGIN 18
@@ -207,6 +206,5 @@ static NSMenu *o_keys_menu = nil;
//#undef CONFIG_ITEM_LIST_STRING
//#undef CONFIG_ITEM_RANGED_INTEGER
-//#undef CONFIG_ITEM_KEY_BEFORE_10_3
//#undef CONFIG_ITEM_KEY_AFTER_10_3
diff --git a/modules/gui/macosx/prefs_widgets.m b/modules/gui/macosx/prefs_widgets.m
index 428c3a8..40e6670 100644
--- a/modules/gui/macosx/prefs_widgets.m
+++ b/modules/gui/macosx/prefs_widgets.m
@@ -467,9 +467,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
case CONFIG_ITEM_BOOL:
i_margin = 7;
break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 7;
- break;
case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 6;
break;
@@ -505,9 +502,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
case CONFIG_ITEM_BOOL:
i_margin = 7;
break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 7;
- break;
case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 6;
break;
@@ -544,9 +538,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
case CONFIG_ITEM_BOOL:
i_margin = 7;
break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 7;
- break;
case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 6;
break;
@@ -583,9 +574,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
case CONFIG_ITEM_BOOL:
i_margin = 10;
break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 10;
- break;
case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 9;
break;
@@ -622,9 +610,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
case CONFIG_ITEM_BOOL:
i_margin = 8;
break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 8;
- break;
case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 7;
break;
@@ -661,9 +646,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
case CONFIG_ITEM_BOOL:
i_margin = 7;
break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 7;
- break;
case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 6;
break;
@@ -700,9 +682,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
case CONFIG_ITEM_BOOL:
i_margin = 7;
break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 7;
- break;
case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 6;
break;
@@ -739,9 +718,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
case CONFIG_ITEM_BOOL:
i_margin = 7;
break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 7;
- break;
case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 5;
break;
@@ -753,45 +729,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
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:
switch( i_lastItem )
{
@@ -817,9 +754,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
case CONFIG_ITEM_BOOL:
i_margin = 7;
break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 7;
- break;
case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 8;
break;
@@ -856,9 +790,6 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
case CONFIG_ITEM_BOOL:
i_margin = 7;
break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 7;
- break;
case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 5;
break;
More information about the vlc-devel
mailing list