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
This commit is contained in:
parent
4a81192edf
commit
1d282b58e4
|
@ -113,7 +113,6 @@
|
|||
return YES;
|
||||
}
|
||||
|
||||
|
||||
- (void)keyDown:(NSEvent *)theEvent
|
||||
{
|
||||
NSString *keyCode = [NSString stringWithFormat:@"%d", [theEvent keyCode]];
|
||||
|
|
|
@ -524,7 +524,6 @@ otherblock();\
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
#if !__has_feature(objc_arc)
|
||||
- (void)dealloc
|
||||
{
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
|
||||
|
||||
@interface PcsxrMemCardController : NSWindowController <NSWindowDelegate>
|
||||
{
|
||||
IBOutlet NSCollectionView *memCard1view;
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
|
||||
#define MAX_MEMCARD_BLOCKS 15
|
||||
|
||||
|
||||
static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, char *str)
|
||||
{
|
||||
// header
|
||||
|
@ -29,7 +28,6 @@ static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, cha
|
|||
//printf("data = %s\n", from + (srci+1) * 128);
|
||||
}
|
||||
|
||||
|
||||
@implementation PcsxrMemCardController
|
||||
|
||||
//memCard1Array KVO functions
|
||||
|
|
|
@ -52,7 +52,6 @@
|
|||
[NSApp stopModal];
|
||||
}
|
||||
|
||||
|
||||
- (BOOL)handleFile:(NSString *)theFile
|
||||
{
|
||||
if ([EmuThread active]) {
|
||||
|
@ -73,5 +72,4 @@
|
|||
return YES;
|
||||
}
|
||||
|
||||
|
||||
@end
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
|
||||
@interface PcsxrPlugin : NSObject {
|
||||
void *pluginRef;
|
||||
|
||||
|
|
|
@ -89,5 +89,4 @@
|
|||
return YES;
|
||||
}
|
||||
|
||||
|
||||
@end
|
||||
|
|
|
@ -82,7 +82,6 @@
|
|||
[tableView reloadData];
|
||||
}
|
||||
|
||||
|
||||
- (BOOL)control:(NSControl *)control textShouldBeginEditing:(NSText *)fieldEditor
|
||||
{
|
||||
return false;
|
||||
|
|
|
@ -75,7 +75,6 @@ void DoAbout()
|
|||
nil]];
|
||||
}
|
||||
|
||||
|
||||
long DoConfiguration()
|
||||
{
|
||||
NSWindow *window;
|
||||
|
@ -212,7 +211,6 @@ void ReadConfig(void)
|
|||
|
||||
@end
|
||||
|
||||
|
||||
char* PLUGLOC(char *toloc)
|
||||
{
|
||||
NSBundle *mainBundle = [NSBundle bundleForClass:[PluginController class]];
|
||||
|
|
|
@ -75,7 +75,6 @@ void AboutDlgProc()
|
|||
nil]];
|
||||
}
|
||||
|
||||
|
||||
void SoftDlgProc()
|
||||
{
|
||||
NSWindow *window;
|
||||
|
|
|
@ -223,7 +223,6 @@ void BlitScreen16NS(unsigned char * surf,long x,long y)
|
|||
#if !__has_feature(objc_arc)
|
||||
[glLock release];
|
||||
|
||||
|
||||
[super dealloc];
|
||||
#endif
|
||||
}
|
||||
|
@ -454,7 +453,6 @@ void BlitScreen16NS(unsigned char * surf,long x,long y)
|
|||
glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, szDispBuf[i]);
|
||||
}
|
||||
|
||||
|
||||
glEnable(rect_texture ? GL_TEXTURE_RECTANGLE_EXT : GL_TEXTURE_2D);
|
||||
glPopMatrix();
|
||||
}
|
||||
|
|
|
@ -175,7 +175,6 @@ void ShowTextGpuPic(void)
|
|||
// this is the default implementation...
|
||||
}
|
||||
|
||||
|
||||
void HandleKey(int keycode)
|
||||
{
|
||||
switch (keycode) {
|
||||
|
|
|
@ -33,7 +33,6 @@
|
|||
|
||||
IBOutlet NSPopUpButton *frameBufferEffects;
|
||||
|
||||
|
||||
IBOutlet NSControl *drawScanlines;
|
||||
IBOutlet NSControl *advancedBlending;
|
||||
IBOutlet NSControl *opaquePass;
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -48,8 +48,6 @@
|
|||
|
||||
@end
|
||||
|
||||
|
||||
|
||||
@interface NetSfPeopsOpenGLGPUPluginWindow (NSMenuValidation)
|
||||
- (BOOL)validateMenuItem:(NSMenuItem*) item;
|
||||
@end
|
||||
|
|
|
@ -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];
|
||||
|
|
|
@ -53,7 +53,6 @@ extern PluginWindowController *gameController;
|
|||
- (NSRect) screenFrame;
|
||||
- (void)subscribeToEvents;
|
||||
|
||||
|
||||
- (id)initWithCoder:(NSCoder *)aDecoder ;
|
||||
- (id)initWithWindow:(NSWindow*)theWindow;
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user