X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5dc43d1fc5bdac58ac689364b74118ea67285305..470402b9966ec0c9b0011193cb82bd6baa4a98c5:/include/wx/clipbrd.h

diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index f4c29ba4b7..6c2d3ac5eb 100644
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -12,10 +12,6 @@
 #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
@@ -65,17 +61,17 @@ public:
 
     // fill data with data on the clipboard (if available)
     virtual bool GetData( wxDataObject& data ) = 0;
-    
+
     // clears wxTheClipboard and the system's clipboard if possible
     virtual void Clear() = 0;
 
     // flushes the clipboard: this means that the data which is currently on
     // clipboard will stay available even after the application exits (possibly
     // eating memory), otherwise the clipboard will be emptied on exit
-    virtual bool Flush() { return FALSE; }
+    virtual bool Flush() { return false; }
 
     // X11 has two clipboards which get selected by this call. Empty on MSW.
-    virtual void UsePrimarySelection( bool WXUNUSED(primary) = FALSE ) { }
+    virtual void UsePrimarySelection( bool WXUNUSED(primary) = false ) { }
 
     // Returns global instance (wxTheClipboard) of the object:
     static wxClipboard *Get();
@@ -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__)