Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OSX, fixed tabulation

Browse Source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1772 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
mantognini 2011-01-20 21:52:27 +00:00
parent f9c4740894
commit 0a7b98dd0b
18 changed files with 1330 additions and 1332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SFML/Graphics/OSX/RenderImageImplPBuffer.cpp
View File

@ -49,7 +49,6 @@ RenderImageImplPBuffer::RenderImageImplPBuffer() :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
RenderImageImplPBuffer::~RenderImageImplPBuffer() RenderImageImplPBuffer::~RenderImageImplPBuffer()
{ {
if (myPBuffer && aglDestroyPBuffer(myPBuffer) == GL_FALSE) { if (myPBuffer && aglDestroyPBuffer(myPBuffer) == GL_FALSE) {
sf::Err() sf::Err()
<< "An error occurs while destroying the PBuffer in " << "An error occurs while destroying the PBuffer in "
@ -101,6 +100,7 @@ bool RenderImageImplPBuffer::Create(unsigned int width, unsigned int height, uns
AGL_DEPTH_SIZE, (depthBuffer ? 24 : 0), AGL_DEPTH_SIZE, (depthBuffer ? 24 : 0),
0 0
}; };
AGLPixelFormat pf = aglChoosePixelFormat(NULL, 0, attribs); AGLPixelFormat pf = aglChoosePixelFormat(NULL, 0, attribs);
if (!pf) { if (!pf) {
sf::Err() sf::Err()

1
src/SFML/Graphics/RenderImageImplFBO.cpp
View File

@ -129,7 +129,6 @@ bool RenderImageImplFBO::Activate(bool active)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void RenderImageImplFBO::UpdateTexture(unsigned int) void RenderImageImplFBO::UpdateTexture(unsigned int)
{ {
// Nothing to do: the FBO draws directly to the target image
glFlush(); glFlush();
} }

4
src/SFML/Window/OSX/SFContext.mm
View File

@ -79,10 +79,10 @@ SFContext::SFContext(SFContext* shared, const WindowImpl* owner,
SFContext::~SFContext() SFContext::~SFContext()
{ {
[myContext release]; [myContext release];
[myPool drain]; // [1] [myPool drain]; // [A]
/* /*
[1] : Produce sometimes "*** attempt to pop an unknown autorelease pool" [A] : Produce sometimes "*** attempt to pop an unknown autorelease pool"
*/ */
} }

11
src/SFML/Window/OSX/WindowImplCocoa.mm
View File

@ -341,7 +341,7 @@ Key::Code WindowImplCocoa::NSKeyCodeToSFMLKeyCode(unsigned short keycode) {
case 0x3d: return Key::RAlt; case 0x3d: return Key::RAlt;
case 0x36: return Key::RSystem; case 0x36: return Key::RSystem;
#warning unknown key code for Menu #warning unknown key code for Menu
// case 0x: return Key::Menu; // case 0x: return Key::Menu;
case 0x21: return Key::LBracket; case 0x21: return Key::LBracket;
case 0x1e: return Key::RBracket; case 0x1e: return Key::RBracket;
case 0x29: return Key::SemiColon; case 0x29: return Key::SemiColon;
@ -357,14 +357,14 @@ Key::Code WindowImplCocoa::NSKeyCodeToSFMLKeyCode(unsigned short keycode) {
case 0x31: return Key::Space; case 0x31: return Key::Space;
case 0x24: return Key::Return; case 0x24: return Key::Return;
#warning unknown key code for Back #warning unknown key code for Back
// case 0x: return Key::Back; // case 0x: return Key::Back;
case 0x30: return Key::Tab; case 0x30: return Key::Tab;
case 0x74: return Key::PageUp; case 0x74: return Key::PageUp;
case 0x79: return Key::PageDown; case 0x79: return Key::PageDown;
case 0x77: return Key::End; case 0x77: return Key::End;
case 0x73: return Key::Home; case 0x73: return Key::Home;
#warning unknown key code for Insert #warning unknown key code for Insert
// case 0x: return Key::Insert; // case 0x: return Key::Insert;
case 0x33: return Key::Delete; case 0x33: return Key::Delete;
case 0x45: return Key::Add; case 0x45: return Key::Add;
case 0x4e: return Key::Subtract; case 0x4e: return Key::Subtract;
@ -400,7 +400,7 @@ Key::Code WindowImplCocoa::NSKeyCodeToSFMLKeyCode(unsigned short keycode) {
case 0x6b: return Key::F14; case 0x6b: return Key::F14;
case 0x71: return Key::F15; case 0x71: return Key::F15;
#warning unknown key code for PAUSE #warning unknown key code for PAUSE
// case 0x: return Key::PAUSE; // case 0x: return Key::PAUSE;
default: return Key::Count; // An unknown key. default: return Key::Count; // An unknown key.
} }
} }
@ -490,8 +490,7 @@ void WindowImplCocoa::EnableKeyRepeat(bool enabled)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplCocoa::SetIcon(unsigned int width, unsigned int height, void WindowImplCocoa::SetIcon(unsigned int width, unsigned int height, const Uint8* pixels)
const Uint8* pixels)
{ {
[myDelegate setIconTo:width by:height with:pixels]; [myDelegate setIconTo:width by:height with:pixels];
} }