From b58dfe3584f7a60fcd5afbdac903b513f7082804 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20Paul=20K=C3=BChne?= Date: Thu, 2 Mar 2006 12:14:52 +0000 Subject: [PATCH] * MainMenu.nib, playlist.m: use NSSearchField instead of NSTextField, so we don't need to replace it manually anymore. This breaks the 10.2-compatibility. (refs #189) * update.m: use mtime() instead of NSCalenderDate for the time-stamp * sfilters.m: fixed 2 compilation warnings (corrected UTF8String to char casting) --- modules/gui/macosx/playlist.m | 23 +---------------------- modules/gui/macosx/sfilters.m | 4 ++-- modules/gui/macosx/update.m | 5 +++-- 3 files changed, 6 insertions(+), 26 deletions(-) diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m index 96e8271a04..9bf6fd8d9f 100644 --- a/modules/gui/macosx/playlist.m +++ b/modules/gui/macosx/playlist.m @@ -463,27 +463,6 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ vlc_list_release( p_list ); vlc_object_release( p_playlist ); - /* Change the simple textfield into a searchField if we can... */ -#if 0 - if( MACOS_VERSION >= 10.3 ) - { - NSView *o_parentview = [o_status_field superview]; - NSSearchField *o_better_search_field = [[NSSearchField alloc]initWithFrame:[o_search_field frame]]; - [o_better_search_field setRecentsAutosaveName:@"VLC media player search"]; - [o_better_search_field setDelegate:self]; - [[NSNotificationCenter defaultCenter] addObserver: self - selector: @selector(searchfieldChanged:) - name: NSControlTextDidChangeNotification - object: o_better_search_field]; - - [o_better_search_field setTarget:self]; - [o_better_search_field setAction:@selector(searchItem:)]; - - [o_better_search_field setAutoresizingMask:NSViewMinXMargin]; - [o_parentview addSubview:o_better_search_field]; - [o_search_field setHidden:YES]; - } -#endif //[self playlistUpdated]; } @@ -524,7 +503,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ { unsigned int i; - /* Clear indications of any existing column sorting*/ + /* Clear indications of any existing column sorting */ for( i = 0 ; i < [[o_outline_view tableColumns] count] ; i++ ) { [o_outline_view setIndicatorImage:nil inTableColumn: diff --git a/modules/gui/macosx/sfilters.m b/modules/gui/macosx/sfilters.m index 1235dd3b20..d699d94314 100644 --- a/modules/gui/macosx/sfilters.m +++ b/modules/gui/macosx/sfilters.m @@ -414,7 +414,7 @@ static VLCsFilters *_o_sharedInstance = nil; } else { - val.psz_string = [[o_marq_marq_fld stringValue] UTF8String]; + val.psz_string = (char *)[[o_marq_marq_fld stringValue] UTF8String]; } if( p_input ) @@ -484,7 +484,7 @@ static VLCsFilters *_o_sharedInstance = nil; } else { - val.psz_string = [[o_time_stamp_fld stringValue] UTF8String]; + val.psz_string = (char *)[[o_time_stamp_fld stringValue] UTF8String]; } if( p_input ) diff --git a/modules/gui/macosx/update.m b/modules/gui/macosx/update.m index 9637eff5c1..e0c210c020 100644 --- a/modules/gui/macosx/update.m +++ b/modules/gui/macosx/update.m @@ -143,8 +143,9 @@ static VLCUpdate *_o_sharedInstance = nil; int x = 0; NSString * pathToReleaseNote; pathToReleaseNote = [NSString stringWithFormat: \ - @"/tmp/vlc_releasenote_%@.tmp", [[NSCalendarDate calendarDate] \ - descriptionWithCalendarFormat: @"%m-%d-%y--%I.%M.%S.%F"]]; + @"/tmp/vlc_releasenote_%d.tmp", mdate()]; /*[[NSCalendarDate calendarDate] \ + descriptionWithCalendarFormat: @"%m-%d-%y--%I.%M.%S.%F"]];*/ + NSLog( pathToReleaseNote ); if( p_uit ) { -- 2.39.5