workaround a Watcom build

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

diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index 0870a03d296243cebaff4555deea26fd0d04f3d7..4e9f4a7ba9e5a595ad730b60f139dfa77a5d8e9b 100644 (file)
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CLIPBRD_H_BASE_
 #define _WX_CLIPBRD_H_BASE_
 
 #ifndef _WX_CLIPBRD_H_BASE_
 #define _WX_CLIPBRD_H_BASE_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "clipboardbase.h"
 #endif
 
     #pragma interface "clipboardbase.h"
 #endif
 


@@ -88,14 +88,14 @@ public:
     #include "wx/motif/clipbrd.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/clipbrd.h"
     #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__)
     #include "wx/os2/clipbrd.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/clipbrd.h"
 #elif defined(__WXPM__)
     #include "wx/os2/clipbrd.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/clipbrd.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -121,7 +121,7 @@ public:
         }
     }
 
         }
     }
 

-    bool IsOk() const { return m_clipboard->IsOpened(); }
+    bool operator!() const { return !m_clipboard->IsOpened(); }

 
     ~wxClipboardLocker()
     {
 
     ~wxClipboardLocker()
     {


@@ -133,6 +133,8 @@ public:
 
 private:
     wxClipboard *m_clipboard;
 
 private:
     wxClipboard *m_clipboard;

+
+    DECLARE_NO_COPY_CLASS(wxClipboardLocker)

 };
 
 #endif // wxUSE_CLIPBOARD
 };
 
 #endif // wxUSE_CLIPBOARD