X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02761f6cd478e3c2c97cf6f93442747f7b029833..69659fd770f615210efac4b4fa741b3ad6223616:/src/common/dpycmn.cpp diff --git a/src/common/dpycmn.cpp b/src/common/dpycmn.cpp index 13b4685281..e728d1b885 100644 --- a/src/common/dpycmn.cpp +++ b/src/common/dpycmn.cpp @@ -118,7 +118,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxDisplayModule, wxModule) // ctor/dtor // ---------------------------------------------------------------------------- -wxDisplay::wxDisplay(size_t n) +wxDisplay::wxDisplay(unsigned n) { wxASSERT_MSG( n < GetCount(), wxT("An invalid index was passed to wxDisplay") ); @@ -135,7 +135,7 @@ wxDisplay::~wxDisplay() // static functions forwarded to wxDisplayFactory // ---------------------------------------------------------------------------- -/* static */ size_t wxDisplay::GetCount() +/* static */ unsigned wxDisplay::GetCount() { return Factory().GetCount(); } @@ -145,7 +145,7 @@ wxDisplay::~wxDisplay() return Factory().GetFromPoint(pt); } -/* static */ int wxDisplay::GetFromWindow(wxWindow *window) +/* static */ int wxDisplay::GetFromWindow(const wxWindow *window) { wxCHECK_MSG( window, wxNOT_FOUND, _T("invalid window") ); @@ -235,7 +235,7 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode) // wxDisplayFactory implementation // ============================================================================ -int wxDisplayFactory::GetFromWindow(wxWindow *window) +int wxDisplayFactory::GetFromWindow(const wxWindow *window) { // consider that the window belongs to the display containing its centre const wxRect r(window->GetRect()); @@ -247,7 +247,7 @@ int wxDisplayFactory::GetFromWindow(wxWindow *window) // ============================================================================ /* static */ -wxDisplayImpl *wxDisplayFactorySingle::CreateDisplay(size_t n) +wxDisplayImpl *wxDisplayFactorySingle::CreateDisplay(unsigned n) { // we recognize the main display only return n != 0 ? NULL : new wxDisplayImplSingle;