summaryrefslogtreecommitdiff
path: root/macosx/plugins/PeopsXgl/macsrc
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-07-04 19:43:04 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-07-04 19:43:04 +0000
commit1d282b58e4404a18efe7095b4a51da0832749add (patch)
tree4b5f509a4d8c81f7b7fe4b40e8dc1a3a3833c7ce /macosx/plugins/PeopsXgl/macsrc
parent4a81192edf7bb1ae1e80fd0e1870897dfd113009 (diff)
downloadpcsxr-1d282b58e4404a18efe7095b4a51da0832749add.tar.gz
get rid of extra, blank lines on OS X.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85818 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins/PeopsXgl/macsrc')
-rwxr-xr-xmacosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h1
-rwxr-xr-xmacosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m2
-rwxr-xr-xmacosx/plugins/PeopsXgl/macsrc/PluginGLView.m5
-rwxr-xr-xmacosx/plugins/PeopsXgl/macsrc/PluginWindow.h2
-rwxr-xr-xmacosx/plugins/PeopsXgl/macsrc/PluginWindow.m5
-rwxr-xr-xmacosx/plugins/PeopsXgl/macsrc/PluginWindowController.h1
-rwxr-xr-xmacosx/plugins/PeopsXgl/macsrc/PluginWindowController.m3
-rwxr-xr-xmacosx/plugins/PeopsXgl/macsrc/drawgl.m5
8 files changed, 2 insertions, 22 deletions
diff --git a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h
index c778dd8d..0487006e 100755
--- a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h
+++ b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h
@@ -33,7 +33,6 @@
IBOutlet NSPopUpButton *frameBufferEffects;
-
IBOutlet NSControl *drawScanlines;
IBOutlet NSControl *advancedBlending;
IBOutlet NSControl *opaquePass;
diff --git a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
index 02c58366..b09c7104 100755
--- a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
+++ b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
@@ -80,7 +80,6 @@ void AboutDlgProc()
nil]];
}
-
void DlgProc()
{
NSWindow *window;
@@ -99,7 +98,6 @@ void DlgProc()
[window makeKeyAndOrderFront:nil];
}
-
void PrepFactoryDefaultPreferences(void)
{
// THE place to find the names of settings.
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginGLView.m b/macosx/plugins/PeopsXgl/macsrc/PluginGLView.m
index 85aa636e..4e8b8c67 100755
--- a/macosx/plugins/PeopsXgl/macsrc/PluginGLView.m
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginGLView.m
@@ -36,7 +36,6 @@
- (BOOL)isOpaque { return YES; }
- (BOOL)acceptsFirstResponder { return NO; }
-
- (id) initWithCoder: (NSCoder *) coder
{
// Set up pixel format on creation
@@ -97,15 +96,15 @@
return self;
}
-#if !__has_feature(objc_arc)
- (void)dealloc
{
[[self openGLContext] makeCurrentContext]; // just in case
[NSOpenGLContext clearCurrentContext];
+#if !__has_feature(objc_arc)
[glLock release];
[super dealloc];
-}
#endif
+}
- (void)reshape // scrolled, moved or resized
{
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindow.h b/macosx/plugins/PeopsXgl/macsrc/PluginWindow.h
index a1d61942..ddeae10b 100755
--- a/macosx/plugins/PeopsXgl/macsrc/PluginWindow.h
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindow.h
@@ -48,8 +48,6 @@
@end
-
-
@interface NetSfPeopsOpenGLGPUPluginWindow (NSMenuValidation)
- (BOOL)validateMenuItem:(NSMenuItem*) item;
@end
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindow.m b/macosx/plugins/PeopsXgl/macsrc/PluginWindow.m
index dd32db65..8e202933 100755
--- a/macosx/plugins/PeopsXgl/macsrc/PluginWindow.m
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindow.m
@@ -58,8 +58,6 @@
return nil;
}
-
-
- (void) windowDidResize:(NSNotification*)notice
{
}
@@ -73,8 +71,6 @@
}
-
-
- (BOOL) canBecomeKeyWindow
{
return YES;
@@ -88,7 +84,6 @@
{
}
-
- (BOOL)validateMenuItem:(NSMenuItem*) menuItem
{
// SEL bleh = [menuItem action];
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h
index 6ad83f63..ad1ef6b0 100755
--- a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h
@@ -53,7 +53,6 @@ extern PluginWindowController *gameController;
- (NSRect) screenFrame;
- (void)subscribeToEvents;
-
- (id)initWithCoder:(NSCoder *)aDecoder ;
- (id)initWithWindow:(NSWindow*)theWindow;
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m
index 55c27785..92d982c8 100755
--- a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m
@@ -61,7 +61,6 @@ NSRect FitRectInRect(NSRect source, NSRect destination)
return newRect;
}
-
@implementation PluginWindowController
+ (id)openGameView
@@ -119,8 +118,6 @@ NSRect FitRectInRect(NSRect source, NSRect destination)
[nc addObserver:self selector:@selector(applicationWillBecomeActive:) name:NSApplicationWillBecomeActiveNotification object:NSApp];
[nc addObserver:self selector:@selector(applicationWillTerminate:) name:NSApplicationWillTerminateNotification object:NSApp];
*/
-
-
}
- (id)initWithCoder:(NSCoder *)aDecoder {
diff --git a/macosx/plugins/PeopsXgl/macsrc/drawgl.m b/macosx/plugins/PeopsXgl/macsrc/drawgl.m
index 953dd239..99637e64 100755
--- a/macosx/plugins/PeopsXgl/macsrc/drawgl.m
+++ b/macosx/plugins/PeopsXgl/macsrc/drawgl.m
@@ -66,7 +66,6 @@ extern int iUseScanLines;
extern unsigned short usCursorActive;
-
int iResX;
int iResY;
long lLowerpart;
@@ -82,9 +81,6 @@ PSXPoint_t ptCursorPoint[8];
char * Xpixels;
char * pCaptionText;
-
-
-
//static PluginWindowController *windowController;
// static is BAD NEWS if user uses other plug ins
PluginGLView *glView;
@@ -230,7 +226,6 @@ void ShowTextGpuPic(void)
// this is the default implementation...
}
-
void HandleKey(int keycode)
{
switch (keycode) {