Fixes for Unicode build.

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

diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index 2e22ea752a14e68f773148b3034e8c5a317fc9b4..3de8f49cf8332830514bd33879b2c06cefc0165f 100644 (file)
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -5,14 +5,14 @@
 // Modified by:
 // Created:     19.10.99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     19.10.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows Team
+// Copyright:   (c) wxWidgets Team

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CLIPBRD_H_BASE_
 #define _WX_CLIPBRD_H_BASE_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CLIPBRD_H_BASE_
 #define _WX_CLIPBRD_H_BASE_
 

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

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


@@ -94,10 +94,10 @@ public:
     #include "wx/mgl/clipbrd.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/clipbrd.h"
     #include "wx/mgl/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(__WXPM__)
     #include "wx/os2/clipbrd.h"

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

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