X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fprefs_widgets.h;h=8d44a7733481de855f405c96669bb57c8b1f248d;hb=e17d5ecd8918a78c8ecbff36110292c1caaafd26;hp=d18688766c983cc2b43006c4245d5e81658295e0;hpb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;p=vlc diff --git a/modules/gui/macosx/prefs_widgets.h b/modules/gui/macosx/prefs_widgets.h index d18688766c..8d44a77334 100644 --- a/modules/gui/macosx/prefs_widgets.h +++ b/modules/gui/macosx/prefs_widgets.h @@ -23,11 +23,12 @@ #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 +static NSMenu *o_keys_menu = nil; + @interface VLCConfigControl : NSView { module_config_t *p_item; @@ -41,18 +42,18 @@ + (VLCConfigControl *)newControl: (module_config_t *)_p_item withView: (NSView *)o_parent_view; - (id)initWithFrame: (NSRect)frame item: (module_config_t *)p_item; -- (NSString *)getName; -- (int)getType; -- (int)getViewType; +- (NSString *)name; +- (int)type; +- (int)viewType; - (BOOL)isAdvanced; - (void)setYPos:(int)i_yPos; - (int)intValue; - (float)floatValue; - (char *)stringValue; - (void)applyChanges; -- (int)getLabelSize; +- (void)resetValues; +- (int)labelSize; - (void) alignWithXPosition:(int)i_xPos; -static NSMenu *o_keys_menu = nil; + (int)calcVerticalMargin: (int)i_curItem lastItem:(int)i_lastItem; @@ -207,6 +208,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