kUIButtonBarButtonAction*, UIAppl, UIProgressIndicatorStyle, NSURL (UIKitAdditions)

diff --git a/UIKit/NSURL-UIKitAdditions.h b/UIKit/NSURL-UIKitAdditions.h
index 44a67dd74e9784090052cbf3b2ccec7a30df6cde..28a66191f56b52a9557a27cde10806e77f4eef8d 100644 (file)
--- a/UIKit/NSURL-UIKitAdditions.h
+++ b/UIKit/NSURL-UIKitAdditions.h
@@ -4,7 +4,7 @@
  *     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2007 by Steve Nygard.
  */
 
  *     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2007 by Steve Nygard.
  */
 

-#import "NSURL.h"
+#import <Foundation/NSURL.h>

 
 @interface NSURL (UIKitAdditions)
 + (id)URLWithTelephoneNumber:(id)fp8;
 
 @interface NSURL (UIKitAdditions)
 + (id)URLWithTelephoneNumber:(id)fp8;

diff --git a/UIKit/UIKit.h b/UIKit/UIKit.h
index 73d559f67685bd22b8244c8d1b62be14a61cac5c..024de93657d8f86832572778ca6371a323239582 100644 (file)
--- a/UIKit/UIKit.h
+++ b/UIKit/UIKit.h
@@ -130,6 +130,15 @@ typedef enum {
     UINavigationButtonStyleDestructive
 } UINavigationButtonStyle;
 
     UINavigationButtonStyleDestructive
 } UINavigationButtonStyle;
 

+typedef enum {
+    UIProgressIndicatorStyleLargeWhite,
+    UIProgressIndicatorStyleMediumWhite,
+    UIProgressIndicatorStyleMediumBrown,
+    UIProgressIndicatorStyleSmallWhite,
+    UIProgressIndicatorStyleSmallBlack,
+    UIProgressIndicatorStyleTinyWhite,
+} UIProgressIndicatorStyle;
+

 typedef enum {
     UITableViewCellEditingStyleNone,
     UITableViewCellEditingStyleDelete,
 typedef enum {
     UITableViewCellEditingStyleNone,
     UITableViewCellEditingStyleDelete,


@@ -263,6 +272,8 @@ enum {
 #import <UIKit/NSString-UIStringDrawing.h>
 #import <UIKit/NSString-UIStringDrawingDeprecated.h>
 
 #import <UIKit/NSString-UIStringDrawing.h>
 #import <UIKit/NSString-UIStringDrawingDeprecated.h>
 

+#import <UIKit/NSURL-UIKitAdditions.h>
+

 #import <CoreGraphics/CoreGraphics.h>
 
 #ifdef __cplusplus
 #import <CoreGraphics/CoreGraphics.h>
 
 #ifdef __cplusplus


@@ -278,10 +289,17 @@ void UIApplicationUseLegacyEvents(BOOL use);
 void UIKeyboardEnableAutomaticAppearance(void);
 void UIKeyboardDisableAutomaticAppearance(void);
 
 void UIKeyboardEnableAutomaticAppearance(void);
 void UIKeyboardDisableAutomaticAppearance(void);
 

-
-#ifdef __cplusplus
-}
-#endif
+extern NSString * const kUIButtonBarButtonAction;
+extern NSString * const kUIButtonBarButtonInfo;
+extern NSString * const kUIButtonBarButtonInfoOffset;
+extern NSString * const kUIButtonBarButtonSelectedInfo;
+extern NSString * const kUIButtonBarButtonStyle;
+extern NSString * const kUIButtonBarButtonTag;
+extern NSString * const kUIButtonBarButtonTarget;
+extern NSString * const kUIButtonBarButtonTitle;
+extern NSString * const kUIButtonBarButtonTitleVerticalHeight;
+extern NSString * const kUIButtonBarButtonTitleWidth;
+extern NSString * const kUIButtonBarButtonType;

 
 extern NSString * const UIKeyboardWillShowNotification;
 extern NSString * const UIKeyboardDidShowNotification;
 
 extern NSString * const UIKeyboardWillShowNotification;
 extern NSString * const UIKeyboardDidShowNotification;


@@ -294,4 +312,10 @@ extern NSString * const UIKeyboardBoundsUserInfoKey;
 extern NSString * const UIWebViewDidReceiveMessageNotification;
 extern NSString * const UIWebViewDidClearMessagesNotification;
 
 extern NSString * const UIWebViewDidReceiveMessageNotification;
 extern NSString * const UIWebViewDidClearMessagesNotification;
 

+extern UIApplication * const UIApp;
+
+#ifdef __cplusplus
+}
+#endif
+

 #endif//UIKIT_UIKIT_H_
 #endif//UIKIT_UIKIT_H_