X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f536e0f24b3bf8358a5e1cb960267d5a3abe5071..57530dba8561c3133657ea946665b2d6a56279b8:/include/wx/clipbrd.h diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h index 0870a03d29..f0a58a62ac 100644 --- a/include/wx/clipbrd.h +++ b/include/wx/clipbrd.h @@ -12,7 +12,7 @@ #ifndef _WX_CLIPBRD_H_BASE_ #define _WX_CLIPBRD_H_BASE_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "clipboardbase.h" #endif @@ -88,8 +88,10 @@ public: #include "wx/motif/clipbrd.h" #elif defined(__WXGTK__) #include "wx/gtk/clipbrd.h" -#elif defined(__WXQT__) - #include "wx/gtk/clipbrd.h" +#elif defined(__WXX11__) + #include "wx/x11/clipbrd.h" +#elif defined(__WXMGL__) + #include "wx/mgl/clipbrd.h" #elif defined(__WXMAC__) #include "wx/mac/clipbrd.h" #elif defined(__WXPM__) @@ -121,7 +123,7 @@ public: } } - bool IsOk() const { return m_clipboard->IsOpened(); } + bool operator!() const { return !m_clipboard->IsOpened(); } ~wxClipboardLocker() {