X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=OSX%2FSaverRunner.h;h=73b83e9d88a6a6495f6e2d33fec1205c34f8afff;hb=d6b0217f2417bd19187f0ebc389d6c5c2233b11c;hp=99d7f6843cf528cc5cf73b571e0143126c1be1b9;hpb=d1ae2829ff0fd2a96c16a0c8c5420efaa47d7b30;p=xscreensaver

diff --git a/OSX/SaverRunner.h b/OSX/SaverRunner.h
index 99d7f684..73b83e9d 100644
--- a/OSX/SaverRunner.h
+++ b/OSX/SaverRunner.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2006-2014 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2006-2016 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -51,7 +51,11 @@
      orientation just before the view controller is modal-presented, and
      restore the proper status bar orientation just before the saverView is
      created so it can pick it up in didRotate:. */
-  UIInterfaceOrientation _storedOrientation;
+  // UIInterfaceOrientation _storedOrientation;
+
+  BOOL _showAboutBox;
+  UIView *aboutBox;
+  NSTimer *splashTimer;
 }
 
 @property(nonatomic, retain) NSString *saverName;
@@ -63,6 +67,8 @@
 @interface SaverRunner : NSObject
 # ifdef USE_IPHONE
   <XScreenSaverViewDelegate>
+# else
+  <NSWindowDelegate>
 # endif
 {
   NSString *saverName;		// the one currently loaded
@@ -84,17 +90,13 @@
 
   SaverViewController *nonrotating_controller;	// Hierarchy 2 (savers)
 
-  EAGLContext *eagl_ctx;
-  GLuint gl_framebuffer, gl_renderbuffer;
   UIImage *saved_screenshot;
-  UIView *aboutBox;
-  NSTimer *splashTimer;
 
 # endif // USE_IPHONE
 }
 
-- (XScreenSaverView *) makeSaverView: (NSString *) module
-                            withSize: (NSSize) size;
+- (XScreenSaverView *) newSaverView: (NSString *) module
+                           withSize: (NSSize) size;
 - (void) loadSaver: (NSString *)name;
 - (void) selectedSaverDidChange:(NSDictionary *)change;
 
@@ -103,8 +105,8 @@
 #else  // USE_IPHONE
 - (void) openPreferences: (NSString *)which;
 - (UIImage *) screenshot;
-- (void)aboutPanel:(UIView *)saverView
-       orientation:(UIInterfaceOrientation)orient;
+- (NSString *) makeDesc:(NSString *)saver
+               yearOnly:(BOOL) yearp;
 #endif // USE_IPHONE
 
 @end