added wx/font.h include to fix PCH-less build

[wxWidgets.git] / include / wx / clipbrd.h

diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index f4c29ba4b71b9429b72be1c9bb533022da7c0df3..6c2d3ac5eb7093cf9674cd8091d4cc269d50d2cf 100644 (file)
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -12,10 +12,6 @@
 #ifndef _WX_CLIPBRD_H_BASE_
 #define _WX_CLIPBRD_H_BASE_
 
 #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/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;
 
     // 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
     // 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.
 
     // 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();
 
     // 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"
     #include "wx/msw/clipbrd.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/clipbrd.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/clipbrd.h"
     #include "wx/gtk/clipbrd.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/clipbrd.h"

 #elif defined(__WXX11__)
     #include "wx/x11/clipbrd.h"
 #elif defined(__WXMGL__)
 #elif defined(__WXX11__)
     #include "wx/x11/clipbrd.h"
 #elif defined(__WXMGL__)