console builds need another header from xcode

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

diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index 6c2d3ac5eb7093cf9674cd8091d4cc269d50d2cf..738343ac4da772844499de8f46d0bf67da9af646 100644 (file)
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -18,11 +18,11 @@
 
 
 #include "wx/object.h"
 
 
 #include "wx/object.h"

-#include "wx/wxchar.h"
+#include "wx/chartype.h"

 
 

-class WXDLLEXPORT wxDataFormat;
-class WXDLLEXPORT wxDataObject;
-class WXDLLEXPORT wxClipboard;
+class WXDLLIMPEXP_FWD_CORE wxDataFormat;
+class WXDLLIMPEXP_FWD_CORE wxDataObject;
+class WXDLLIMPEXP_FWD_CORE wxClipboard;

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


@@ -32,10 +32,10 @@ class WXDLLEXPORT wxClipboard;
 // with wxDataObject.
 // ----------------------------------------------------------------------------
 
 // with wxDataObject.
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxClipboardBase : public wxObject
+class WXDLLIMPEXP_CORE wxClipboardBase : public wxObject

 {
 public:
 {
 public:

-    wxClipboardBase() {}
+    wxClipboardBase() { m_usePrimary = false; }

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


@@ -70,11 +70,28 @@ public:
     // eating memory), otherwise the clipboard will be emptied on exit
     virtual bool Flush() { return false; }
 
     // eating memory), otherwise the clipboard will be emptied on exit
     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 ) { }
+    // this allows to choose whether we work with CLIPBOARD (default) or
+    // PRIMARY selection on X11-based systems
+    //
+    // on the other ones, working with primary selection does nothing: this
+    // allows to write code which sets the primary selection when something is
+    // selected without any ill effects (i.e. without overwriting the
+    // clipboard which would be wrong on the platforms without X11 PRIMARY)
+    virtual void UsePrimarySelection(bool usePrimary = false)
+    {
+        m_usePrimary = usePrimary;
+    }
+
+    // return true if we're using primary selection
+    bool IsUsingPrimarySelection() const { return m_usePrimary; }

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

+
+
+    // don't use this directly, it is public for compatibility with some ports
+    // (wxX11, wxMotif, ...) only
+    bool m_usePrimary;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -101,7 +118,7 @@ public:
 #elif defined(__WXMGL__)
     #include "wx/mgl/clipbrd.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXMGL__)
     #include "wx/mgl/clipbrd.h"
 #elif defined(__WXMAC__)

-    #include "wx/mac/clipbrd.h"
+    #include "wx/osx/clipbrd.h"

 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/clipbrd.h"
 #elif defined(__WXPM__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/clipbrd.h"
 #elif defined(__WXPM__)


@@ -112,7 +129,7 @@ public:
 // helpful class for opening the clipboard and automatically closing it
 // ----------------------------------------------------------------------------
 
 // helpful class for opening the clipboard and automatically closing it
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxClipboardLocker
+class WXDLLIMPEXP_CORE wxClipboardLocker

 {
 public:
     wxClipboardLocker(wxClipboard *clipboard = (wxClipboard *)NULL)
 {
 public:
     wxClipboardLocker(wxClipboard *clipboard = (wxClipboard *)NULL)