Permalink
Browse files

progress bar issues

git-svn-id: http://otx.osxninja.com/builds/trunk@551 5968870d-8a1b-0410-8ef2-9208d525af3e
  • Loading branch information...
1 parent b210cf8 commit a3d3dde28e0206a9e20305d54ffb273639036d13 otxdev committed Jan 6, 2010
Showing with 17 additions and 4 deletions.
  1. +2 −2 otx.xcodeproj/project.pbxproj
  2. +5 −0 otx_Prefix.pch
  3. +1 −1 source/AppController.h
  4. +9 −1 source/AppController.m
@@ -578,7 +578,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "-falign-loops=16";
PREBINDING = NO;
- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+ SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
USER_HEADER_SEARCH_PATHS = "source/binutils-2.17/include/ source/binutils-2.17/libiberty/";
WARNING_CFLAGS = "-wall";
};
@@ -611,7 +611,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "-falign-loops=16";
PREBINDING = NO;
- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+ SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
USER_HEADER_SEARCH_PATHS = "source/binutils-2.17/include/ source/binutils-2.17/libiberty/";
};
name = Release;
View
@@ -13,6 +13,11 @@
#define NSAppKitVersionNumber10_4 824
#endif
+#ifndef NSAppKitVersionNumber10_6
+ #define NSAppKitVersionNumber10_6 1038
+#endif
+
#define OS_IS_PRE_TIGER NSAppKitVersionNumber < NSAppKitVersionNumber10_4
#define OS_IS_POST_TIGER floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4
#define OS_IS_TIGER (!OS_IS_PRE_TIGER) && (!OS_IS_POST_TIGER)
+#define OS_IS_PRE_SNOW NSAppKitVersionNumber < NSAppKitVersionNumber10_6
View
@@ -73,7 +73,7 @@ CPUID;
// ============================================================================
-@interface AppController : NSObject<ProgressReporter, ErrorReporter>
+@interface AppController : NSObject<ProgressReporter, ErrorReporter, NSAnimationDelegate, NSToolbarDelegate>
{
@private
// main window
View
@@ -359,10 +359,18 @@ - (IBAction)attemptToProcessFile: (id)sender
{
gCancel = NO; // Fresh start.
+ NSTimeInterval interval = 0.0333;
+
+ if (OS_IS_PRE_SNOW)
+ interval = 0.0;
+
if (iIndeterminateProgBarMainThreadTimer)
+ {
+ [iIndeterminateProgBarMainThreadTimer invalidate];
[iIndeterminateProgBarMainThreadTimer release];
+ }
- iIndeterminateProgBarMainThreadTimer = [NSTimer scheduledTimerWithTimeInterval: 0.0
+ iIndeterminateProgBarMainThreadTimer = [NSTimer scheduledTimerWithTimeInterval: interval
target: self selector: @selector(nudgeIndeterminateProgBar:)
userInfo: nil repeats: YES];

0 comments on commit a3d3dde

Please sign in to comment.