Browse Source

Fixed OSX entry.

bkaradzic 11 years ago
parent
commit
5ae9de7482
2 changed files with 13 additions and 12 deletions
  1. 5 5
      examples/07-callback/callback.cpp
  2. 8 7
      examples/common/entry/entry_osx.mm

+ 5 - 5
examples/07-callback/callback.cpp

@@ -64,7 +64,7 @@ static const uint16_t s_cubeIndices[36] =
 void saveTga(const char* _filePath, uint32_t _width, uint32_t _height, uint32_t _srcPitch, const void* _src, bool _grayscale, bool _yflip)
 void saveTga(const char* _filePath, uint32_t _width, uint32_t _height, uint32_t _srcPitch, const void* _src, bool _grayscale, bool _yflip)
 {
 {
 	FILE* file = fopen(_filePath, "wb");
 	FILE* file = fopen(_filePath, "wb");
-	if ( NULL != file )
+	if (NULL != file)
 	{
 	{
 		uint8_t type = _grayscale ? 3 : 2;
 		uint8_t type = _grayscale ? 3 : 2;
 		uint8_t bpp = _grayscale ? 8 : 32;
 		uint8_t bpp = _grayscale ? 8 : 32;
@@ -72,14 +72,14 @@ void saveTga(const char* _filePath, uint32_t _width, uint32_t _height, uint32_t
 		putc(0, file);
 		putc(0, file);
 		putc(0, file);
 		putc(0, file);
 		putc(type, file);
 		putc(type, file);
-		putc(0, file); 
 		putc(0, file);
 		putc(0, file);
-		putc(0, file); 
 		putc(0, file);
 		putc(0, file);
 		putc(0, file);
 		putc(0, file);
-		putc(0, file); 
 		putc(0, file);
 		putc(0, file);
-		putc(0, file); 
+		putc(0, file);
+		putc(0, file);
+		putc(0, file);
+		putc(0, file);
 		putc(0, file);
 		putc(0, file);
 		putc(_width&0xff, file);
 		putc(_width&0xff, file);
 		putc( (_width>>8)&0xff, file);
 		putc( (_width>>8)&0xff, file);

+ 8 - 7
examples/common/entry/entry_osx.mm

@@ -276,23 +276,24 @@ namespace entry
 		s_ctx.m_eventQueue.release(_event);
 		s_ctx.m_eventQueue.release(_event);
 	}
 	}
 
 
-	void setWindowSize(uint32_t _width, uint32_t _height)
+	void setWindowSize(WindowHandle _handle, uint32_t _width, uint32_t _height)
 	{
 	{
-		BX_UNUSED(_width, _height);
+		BX_UNUSED(_handle, _width, _height);
 	}
 	}
 
 
-	void setWindowTitle(const char* _title)
+	void setWindowTitle(WindowHandle _handle, const char* _title)
 	{
 	{
-		BX_UNUSED(_title);
+		BX_UNUSED(_handle, _title);
 	}
 	}
 
 
-	void toggleWindowFrame()
+	void toggleWindowFrame(WindowHandle _handle)
 	{
 	{
+		BX_UNUSED(_handle);
 	}
 	}
 
 
-	void setMouseLock(bool _lock)
+	void setMouseLock(WindowHandle _handle, bool _lock)
 	{
 	{
-		BX_UNUSED(_lock);
+		BX_UNUSED(_handle, _lock);
 	}
 	}
 
 
 } // namespace entry
 } // namespace entry