X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fdd7a38bb2e8029c15883adb6d52c6477cb84598..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/cocoa/display.mm?ds=sidebyside

diff --git a/src/cocoa/display.mm b/src/cocoa/display.mm
index f1d7739174..3e375d45c9 100644
--- a/src/cocoa/display.mm
+++ b/src/cocoa/display.mm
@@ -18,14 +18,15 @@
 
 #if wxUSE_DISPLAY
 
+#include "wx/display.h"
+
 #ifndef WX_PRECOMP
-   #include "wx/dynarray.h"
+    #include "wx/dynarray.h"
+    #include "wx/string.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/display.h"
 #include "wx/display_impl.h"
-#include "wx/gdicmn.h"
-#include "wx/string.h"
 
 #import <Foundation/Foundation.h>
 
@@ -36,7 +37,7 @@
 class wxDisplayImplMacOSX : public wxDisplayImpl
 {
 public:
-    wxDisplayImplMacOSX(size_t n, CGDirectDisplayID id_)
+    wxDisplayImplMacOSX(unsigned n, CGDirectDisplayID id_)
         : wxDisplayImpl(n),
           m_id(id_)
     {
@@ -60,8 +61,8 @@ class wxDisplayFactoryMacOSX : public wxDisplayFactory
 public:
     wxDisplayFactoryMacOSX() { }
 
-    virtual wxDisplayImpl *CreateDisplay(size_t n);
-    virtual size_t GetCount();
+    virtual wxDisplayImpl *CreateDisplay(unsigned n);
+    virtual unsigned GetCount();
     virtual int GetFromPoint(const wxPoint& pt);
 
 protected:
@@ -72,7 +73,7 @@ protected:
 // wxDisplayFactoryMacOSX implementation
 // ============================================================================
 
-size_t wxDisplayFactoryMacOSX::GetCount()
+unsigned wxDisplayFactoryMacOSX::GetCount()
 {
     CGDisplayCount count;
 #ifdef __WXDEBUG__
@@ -120,7 +121,7 @@ int wxDisplayFactoryMacOSX::GetFromPoint(const wxPoint& p)
     return nWhich;
 }
 
-wxDisplayImpl *wxDisplayFactoryMacOSX::CreateDisplay(size_t n)
+wxDisplayImpl *wxDisplayFactoryMacOSX::CreateDisplay(unsigned n)
 {
     CGDisplayCount theCount = GetCount();
     CGDirectDisplayID* theIDs = new CGDirectDisplayID[theCount];
@@ -226,4 +227,3 @@ bool wxDisplayImplMacOSX::ChangeMode(const wxVideoMode& mode)
 }
 
 #endif // wxUSE_DISPLAY
-