X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd05139a8023fd3e30476409fafbe04221c6d627..80a779275ae04443c568dca919adb26cf6f5002c:/src/common/dpycmn.cpp?ds=sidebyside diff --git a/src/common/dpycmn.cpp b/src/common/dpycmn.cpp index ce5fc0ac22..fe867c595d 100644 --- a/src/common/dpycmn.cpp +++ b/src/common/dpycmn.cpp @@ -27,11 +27,11 @@ #ifndef WX_PRECOMP #include "wx/gdicmn.h" #include "wx/window.h" + #include "wx/module.h" #endif //WX_PRECOMP #include "wx/display.h" #include "wx/display_impl.h" -#include "wx/module.h" #if wxUSE_DISPLAY @@ -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(); } @@ -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;