don't export deprecated interface to clipboard from DLL

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

diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index 4e9f4a7ba9e5a595ad730b60f139dfa77a5d8e9b..f4c29ba4b71b9429b72be1c9bb533022da7c0df3 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
 


@@ -26,6 +26,7 @@
 
 class WXDLLEXPORT wxDataFormat;
 class WXDLLEXPORT wxDataObject;
 
 class WXDLLEXPORT wxDataFormat;
 class WXDLLEXPORT wxDataObject;

+class WXDLLEXPORT wxClipboard;

 
 // ----------------------------------------------------------------------------
 // wxClipboard represents the system clipboard. Normally, you should use
 
 // ----------------------------------------------------------------------------
 // wxClipboard represents the system clipboard. Normally, you should use


@@ -38,7 +39,7 @@ class WXDLLEXPORT wxDataObject;
 class WXDLLEXPORT wxClipboardBase : public wxObject
 {
 public:
 class WXDLLEXPORT wxClipboardBase : public wxObject
 {
 public:

-    wxClipboardBase();
+    wxClipboardBase() {}

 
     // open the clipboard before Add/SetData() and GetData()
     virtual bool Open() = 0;
 
     // open the clipboard before Add/SetData() and GetData()
     virtual bool Open() = 0;


@@ -76,8 +77,17 @@ public:
     // X11 has two clipboards which get selected by this call. Empty on MSW.
     virtual void UsePrimarySelection( bool WXUNUSED(primary) = FALSE ) { }
 
     // X11 has two clipboards which get selected by this call. Empty on MSW.
     virtual void UsePrimarySelection( bool WXUNUSED(primary) = FALSE ) { }
 

+    // Returns global instance (wxTheClipboard) of the object:
+    static wxClipboard *Get();

 };
 
 };
 

+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+
+// The global clipboard object - backward compatible access macro:
+#define wxTheClipboard   (wxClipboard::Get())
+

 // ----------------------------------------------------------------------------
 // include platform-specific class declaration
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // include platform-specific class declaration
 // ----------------------------------------------------------------------------


@@ -94,17 +104,12 @@ 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"
 #endif
 
 #elif defined(__WXPM__)
     #include "wx/os2/clipbrd.h"
 #endif
 

-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
-
-// The global clipboard object
-WXDLLEXPORT_DATA(extern wxClipboard *) wxTheClipboard;
-

 // ----------------------------------------------------------------------------
 // helpful class for opening the clipboard and automatically closing it
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // helpful class for opening the clipboard and automatically closing it
 // ----------------------------------------------------------------------------