X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c33522fca7cddc441a316f5b9fb50d7685435ba..7a0a6cc8f61cb53ce1c76897489e1e363d1a1fa5:/src/unix/displayx11.cpp diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp index 23d28857a6..7e0b469080 100644 --- a/src/unix/displayx11.cpp +++ b/src/unix/displayx11.cpp @@ -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 @@ -366,7 +366,7 @@ private: void wxClientDisplayRect(int *x, int *y, int *width, int *height) { Display * const dpy = wxGetX11Display(); - wxCHECK_RET( dpy, _T("can't be called before initializing the GUI") ); + wxCHECK_RET( dpy, wxT("can't be called before initializing the GUI") ); const Atom atomWorkArea = XInternAtom(dpy, "_NET_WORKAREA", True); if ( atomWorkArea ) @@ -402,7 +402,7 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height) format != 32 || numItems != 4 ) { - wxLogDebug(_T("XGetWindowProperty(\"_NET_WORKAREA\") failed")); + wxLogDebug(wxT("XGetWindowProperty(\"_NET_WORKAREA\") failed")); return; }