Applied patch [ 670782 ] Combobox uses popup window width

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

diff --git a/include/wx/gtk/dataform.h b/include/wx/gtk/dataform.h
index a0618e01af5761bb53481c6d630e325d6652fe8e..00b2c9f0c0a1ef400d83ed9fad2d71baaaab4eb4 100644 (file)
--- a/include/wx/gtk/dataform.h
+++ b/include/wx/gtk/dataform.h
@@ -24,6 +24,8 @@ public:
     wxDataFormat( const wxChar *id );
     wxDataFormat( NativeFormat format );
 
     wxDataFormat( const wxChar *id );
     wxDataFormat( NativeFormat format );
 

+    wxDataFormat& operator=(const wxDataFormat& format)
+        { m_type = format.m_type; m_format = format.m_format; return *this; }

     wxDataFormat& operator=(NativeFormat format)
         { SetId(format); return *this; }
 
     wxDataFormat& operator=(NativeFormat format)
         { SetId(format); return *this; }
 


@@ -32,6 +34,10 @@ public:
         { return m_format == (NativeFormat)format; }
     bool operator!=(NativeFormat format) const
         { return m_format != (NativeFormat)format; }
         { return m_format == (NativeFormat)format; }
     bool operator!=(NativeFormat format) const
         { return m_format != (NativeFormat)format; }

+    bool operator==(wxDataFormatId format) const
+        { return m_type == (wxDataFormatId)format; }
+    bool operator!=(wxDataFormatId format) const
+        { return m_type != (wxDataFormatId)format; }

 
     // explicit and implicit conversions to NativeFormat which is one of
     // standard data types (implicit conversion is useful for preserving the
 
     // explicit and implicit conversions to NativeFormat which is one of
     // standard data types (implicit conversion is useful for preserving the


@@ -48,13 +54,13 @@ public:
 
     // implementation
     wxDataFormatId GetType() const;
 
     // implementation
     wxDataFormatId GetType() const;

+    void SetType( wxDataFormatId type );

 
 private:
     wxDataFormatId   m_type;
     NativeFormat     m_format;
 
     void PrepareFormats();
 
 private:
     wxDataFormatId   m_type;
     NativeFormat     m_format;
 
     void PrepareFormats();

-    void SetType( wxDataFormatId type );

 };
 
 #endif // _WX_GTK_DATAFORM_H
 };
 
 #endif // _WX_GTK_DATAFORM_H