projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent accession of to-be-deleted mdi
[wxWidgets.git]
/
src
/
cocoa
/
display.mm
diff --git
a/src/cocoa/display.mm
b/src/cocoa/display.mm
index 0694473028426ab901bb9612b28b7f8ed957bf03..3e375d45c956487335f7d84073e9dccdcae265a6 100644
(file)
--- a/
src/cocoa/display.mm
+++ b/
src/cocoa/display.mm
@@
-23,10
+23,10
@@
#ifndef WX_PRECOMP
#include "wx/dynarray.h"
#include "wx/string.h"
#ifndef WX_PRECOMP
#include "wx/dynarray.h"
#include "wx/string.h"
+ #include "wx/gdicmn.h"
#endif
#include "wx/display_impl.h"
#endif
#include "wx/display_impl.h"
-#include "wx/gdicmn.h"
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@@
-37,7
+37,7
@@
class wxDisplayImplMacOSX : public wxDisplayImpl
{
public:
class wxDisplayImplMacOSX : public wxDisplayImpl
{
public:
- wxDisplayImplMacOSX(
size_t
n, CGDirectDisplayID id_)
+ wxDisplayImplMacOSX(
unsigned
n, CGDirectDisplayID id_)
: wxDisplayImpl(n),
m_id(id_)
{
: wxDisplayImpl(n),
m_id(id_)
{
@@
-61,8
+61,8
@@
class wxDisplayFactoryMacOSX : public wxDisplayFactory
public:
wxDisplayFactoryMacOSX() { }
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:
virtual int GetFromPoint(const wxPoint& pt);
protected:
@@
-73,7
+73,7
@@
protected:
// wxDisplayFactoryMacOSX implementation
// ============================================================================
// wxDisplayFactoryMacOSX implementation
// ============================================================================
-
size_t
wxDisplayFactoryMacOSX::GetCount()
+
unsigned
wxDisplayFactoryMacOSX::GetCount()
{
CGDisplayCount count;
#ifdef __WXDEBUG__
{
CGDisplayCount count;
#ifdef __WXDEBUG__
@@
-121,7
+121,7
@@
int wxDisplayFactoryMacOSX::GetFromPoint(const wxPoint& p)
return nWhich;
}
return nWhich;
}
-wxDisplayImpl *wxDisplayFactoryMacOSX::CreateDisplay(
size_t
n)
+wxDisplayImpl *wxDisplayFactoryMacOSX::CreateDisplay(
unsigned
n)
{
CGDisplayCount theCount = GetCount();
CGDirectDisplayID* theIDs = new CGDirectDisplayID[theCount];
{
CGDisplayCount theCount = GetCount();
CGDirectDisplayID* theIDs = new CGDirectDisplayID[theCount];