wxGTK compiles (and seems to work) again after wxMenu changes

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

diff --git a/include/wx/gtk1/clipbrd.h b/include/wx/gtk1/clipbrd.h
index 913379cac7631cd26f89afb2ce9434d1f7d83165..0bc454dc22910c7a7422c98a87cb5e907181dbae 100644 (file)
--- a/include/wx/gtk1/clipbrd.h
+++ b/include/wx/gtk1/clipbrd.h
@@ -15,8 +15,6 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_CLIPBOARD
 
 #include "wx/object.h"
 #if wxUSE_CLIPBOARD
 
 #include "wx/object.h"


@@ -25,27 +23,12 @@
 #include "wx/control.h"
 #include "wx/module.h"
 
 #include "wx/control.h"
 #include "wx/module.h"
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxClipboard;
-class wxClipboardModule;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern wxClipboard* wxTheClipboard;
-
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxClipboard
 // wxClipboard

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

-class wxClipboard : public wxObject
+class wxClipboard : public wxClipboardBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxClipboard)
-

 public:
     wxClipboard();
     ~wxClipboard();
 public:
     wxClipboard();
     ~wxClipboard();


@@ -56,6 +39,9 @@ public:
     // close the clipboard after SetData() and GetData()
     virtual void Close();
 
     // close the clipboard after SetData() and GetData()
     virtual void Close();
 

+    // query whether the clipboard is opened
+    virtual bool IsOpened() const;
+

     // set the clipboard data. all other formats will be deleted.
     virtual bool SetData( wxDataObject *data );
 
     // set the clipboard data. all other formats will be deleted.
     virtual bool SetData( wxDataObject *data );
 


@@ -63,46 +49,39 @@ public:
     virtual bool AddData( wxDataObject *data );
 
     // ask if data in correct format is available
     virtual bool AddData( wxDataObject *data );
 
     // ask if data in correct format is available

-    virtual bool IsSupported( wxDataObject &data );
+    virtual bool IsSupported( const wxDataFormat& format );

 
     // fill data with data on the clipboard (if available)
 
     // fill data with data on the clipboard (if available)

-    virtual bool GetData( wxDataObject &data );
+    virtual bool GetData( wxDataObject& data );

 
     // clears wxTheClipboard and the system's clipboard if possible
     virtual void Clear();
 
 
     // clears wxTheClipboard and the system's clipboard if possible
     virtual void Clear();
 

-    // implementation
-
+    // If primary == TRUE, use primary selection in all further ops,
+    // primary == FALSE resets it.
+    virtual void UsePrimarySelection(bool primary = TRUE)
+        { m_usePrimary = primary; }
+    
+    // implementation from now on

     bool              m_open;
     bool              m_open;

-

     bool              m_ownsClipboard;
     bool              m_ownsPrimarySelection;
     bool              m_ownsClipboard;
     bool              m_ownsPrimarySelection;

+    wxDataObject     *m_data;

 
 

-    wxDataBroker     *m_dataBroker;
-    GtkWidget        *m_clipboardWidget;
+    GtkWidget        *m_clipboardWidget;  /* for getting and offering data */
+    GtkWidget        *m_targetsWidget;    /* for getting list of supported formats */
+    bool              m_waiting;          /* querying data or formats is asynchronous */

 
     bool              m_formatSupported;
     GdkAtom           m_targetRequested;
 
     bool              m_formatSupported;
     GdkAtom           m_targetRequested;

+    bool              m_usePrimary;
+    wxDataObject     *m_receivedData;

 
 

-    wxDataObject      *m_receivedData;
-};
-
-//-----------------------------------------------------------------------------
-// wxClipboardModule
-//-----------------------------------------------------------------------------
-
-class wxClipboardModule: public wxModule
-{
-  DECLARE_DYNAMIC_CLASS(wxClipboardModule)
-
-public:
-    wxClipboardModule() {}
-    bool OnInit();
-    void OnExit();
+private:
+    DECLARE_DYNAMIC_CLASS(wxClipboard)

 };
 
 #endif
 };
 
 #endif

-

    // wxUSE_CLIPBOARD
 
 #endif
    // wxUSE_CLIPBOARD
 
 #endif