X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68379eaf0ae64d105f8244b1db83e793f7dd83b0..359bd4d1a20bdd5c6374f25779a43e92eebe9a1d:/include/wx/clipbrd.h diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h index e53990c2cb..c749a4e675 100644 --- a/include/wx/clipbrd.h +++ b/include/wx/clipbrd.h @@ -12,17 +12,13 @@ #ifndef _WX_CLIPBRD_H_BASE_ #define _WX_CLIPBRD_H_BASE_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "clipboardbase.h" -#endif - #include "wx/defs.h" #if wxUSE_CLIPBOARD #include "wx/object.h" -#include "wx/wxchar.h" +#include "wx/chartype.h" class WXDLLEXPORT wxDataFormat; class WXDLLEXPORT wxDataObject; @@ -96,8 +92,10 @@ public: #include "wx/msw/clipbrd.h" #elif defined(__WXMOTIF__) #include "wx/motif/clipbrd.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/clipbrd.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/clipbrd.h" #elif defined(__WXX11__) #include "wx/x11/clipbrd.h" #elif defined(__WXMGL__)