X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69fb24ce03b4dd40e7912936d628bea1719aaaa3..a95f37bc57cd0318ee2ae5cc94ac447cce47a5cf:/src/unix/displayx11.cpp diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp index de3a03b019..0aafee0a54 100644 --- a/src/unix/displayx11.cpp +++ b/src/unix/displayx11.cpp @@ -71,7 +71,7 @@ public: operator const XineramaScreenInfo *() const { return m_screens; } - unsigned GetCount() const { return wx_static_cast(unsigned, m_num); } + unsigned GetCount() const { return static_cast(m_num); } private: XineramaScreenInfo *m_screens; @@ -110,7 +110,7 @@ private: wxRect m_rect; int m_depth; - DECLARE_NO_COPY_CLASS(wxDisplayImplX11) + wxDECLARE_NO_COPY_CLASS(wxDisplayImplX11); }; class wxDisplayFactoryX11 : public wxDisplayFactory @@ -123,7 +123,7 @@ public: virtual int GetFromPoint(const wxPoint& pt); protected: - DECLARE_NO_COPY_CLASS(wxDisplayFactoryX11) + wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryX11); }; // ============================================================================ @@ -358,7 +358,7 @@ public: private: void *m_ptr; - DECLARE_NO_COPY_CLASS(wxX11Ptr) + wxDECLARE_NO_COPY_CLASS(wxX11Ptr); }; // NB: this function is implemented using X11 and not GDK calls as it's shared