X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..6076b569f0b3eb2574df44a8711850555c17b601:/include/wx/clipbrd.h diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h index d04fa7df9a..ca72949a5c 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(NO_GCC_PRAGMA) #pragma interface "clipboardbase.h" #endif @@ -88,16 +88,16 @@ public: #include "wx/motif/clipbrd.h" #elif defined(__WXGTK__) #include "wx/gtk/clipbrd.h" +#elif defined(__WXX11__) + #include "wx/x11/clipbrd.h" #elif defined(__WXMGL__) #include "wx/mgl/clipbrd.h" -#elif defined(__WXQT__) - #include "wx/gtk/clipbrd.h" #elif defined(__WXMAC__) #include "wx/mac/clipbrd.h" +#elif defined(__WXCOCOA__) + #include "wx/cocoa/clipbrd.h" #elif defined(__WXPM__) #include "wx/os2/clipbrd.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/clipbrd.h" #endif // ---------------------------------------------------------------------------- @@ -135,6 +135,8 @@ public: private: wxClipboard *m_clipboard; + + DECLARE_NO_COPY_CLASS(wxClipboardLocker) }; #endif // wxUSE_CLIPBOARD