Applied Russel's changes to wxToolBarBase

[wxWidgets.git] / include / wx / gtk / dataobj.h

diff --git a/include/wx/gtk/dataobj.h b/include/wx/gtk/dataobj.h
index 2a9bc78242c8b28fe472dc6667ce9b7f9d3d924f..42233e4494ada6fe68377a85622faf9e6d7f4d61 100644 (file)
--- a/include/wx/gtk/dataobj.h
+++ b/include/wx/gtk/dataobj.h
@@ -32,7 +32,7 @@ class wxPrivateDataObject;
 class wxFileDataObject;
 
 //-------------------------------------------------------------------------
 class wxFileDataObject;
 
 //-------------------------------------------------------------------------

-// wxDataFormat
+// wxDataType (internal)

 //-------------------------------------------------------------------------
 
 enum wxDataType
 //-------------------------------------------------------------------------
 
 enum wxDataType


@@ -57,32 +57,40 @@ enum wxDataType
   wxDF_PRIVATE =          20
 };
 
   wxDF_PRIVATE =          20
 };
 

+//-------------------------------------------------------------------------
+// wxDataFormat (internal)
+//-------------------------------------------------------------------------
+

 class wxDataFormat : public wxObject
 {
   DECLARE_CLASS( wxDataFormat )
   
 public:
   
 class wxDataFormat : public wxObject
 {
   DECLARE_CLASS( wxDataFormat )
   
 public:
   

+  wxDataFormat();

   wxDataFormat( wxDataType type );
   wxDataFormat( const wxString &id );
   wxDataFormat( wxDataFormat &format );
   wxDataFormat( const GdkAtom atom );
   wxDataFormat( wxDataType type );
   wxDataFormat( const wxString &id );
   wxDataFormat( wxDataFormat &format );
   wxDataFormat( const GdkAtom atom );

-    
-  int GetType() const;
+
+  void SetType( wxDataType type );    
+  wxDataType GetType() const;
+  

   wxString GetId() const;
   void SetId( const wxString &id );
   wxString GetId() const;
   void SetId( const wxString &id );

+  

   GdkAtom GetAtom();
       
 private:
 
   GdkAtom GetAtom();
       
 private:
 

-  int       m_type;
-  wxString  m_id;
-  bool      m_hasAtom;
-  GdkAtom   m_atom;
+  wxDataType  m_type;
+  wxString    m_id;
+  bool        m_hasAtom;
+  GdkAtom     m_atom;

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

-// wxDataBroker handles data and ormat negotiation for clipboard and DnD
+// wxDataBroker (internal)

 //-------------------------------------------------------------------------
 
 class wxDataBroker : public wxObject
 //-------------------------------------------------------------------------
 
 class wxDataBroker : public wxObject


@@ -151,9 +159,13 @@ public:
   
   /* implementation */
   
   
   /* implementation */
   

-  virtual wxDataFormat &GetFormat() const;
+  wxDataFormat &GetFormat();
+  
+  wxDataType GetFormatType() const;
+  wxString   GetFormatId() const;
+  GdkAtom    GetFormatAtom() const;

   
   

-  wxDataFormat *m_format;
+  wxDataFormat m_format;

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