check for wxUSE_TIMER in headers, not the files including them

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

diff --git a/include/wx/mac/carbon/clipbrd.h b/include/wx/mac/carbon/clipbrd.h
index 36e47b93187d716311af996114403292dfddcaf6..3dd00d3bef7e23a1830cb52b3ae1108259f86f28 100644 (file)
--- a/include/wx/mac/carbon/clipbrd.h
+++ b/include/wx/mac/carbon/clipbrd.h
@@ -25,14 +25,14 @@
 // wxClipboard
 //-----------------------------------------------------------------------------
 
 // wxClipboard
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDataObject;
+class WXDLLIMPEXP_FWD_CORE wxDataObject;

 class WXDLLEXPORT wxClipboard : public wxClipboardBase
 {
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 
 public:
     wxClipboard();
 class WXDLLEXPORT wxClipboard : public wxClipboardBase
 {
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 
 public:
     wxClipboard();

-    ~wxClipboard();
+    virtual ~wxClipboard();

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


@@ -63,9 +63,6 @@ public:
     // eating memory), otherwise the clipboard will be emptied on exit
     virtual bool Flush();
 
     // eating memory), otherwise the clipboard will be emptied on exit
     virtual bool Flush();
 

-    // X11 has two clipboards which get selected by this call. Empty on MSW.
-    void UsePrimarySelection( bool WXUNUSED(primary) = FALSE ) { }
-

 private:
     wxDataObject     *m_data;
     bool              m_open;
 private:
     wxDataObject     *m_data;
     bool              m_open;


@@ -73,5 +70,4 @@ private:
 
 #endif // wxUSE_CLIPBOARD
 
 
 #endif // wxUSE_CLIPBOARD
 

-#endif
-    // _WX_CLIPBRD_H_
+#endif // _WX_CLIPBRD_H_