1. wxDataObject compilation fixes (can't test if it works right now, sorry)
2. wxProgressDialog ctor has "style" parameter 3. the controls samples now also demonstrates wxUpdateUI events and wxProgressDialog git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -44,7 +44,7 @@ public:
|
||||
wxDataFormat( wxDataFormatId type );
|
||||
wxDataFormat( const wxString &id );
|
||||
wxDataFormat( const wxChar *id );
|
||||
wxDataFormat( wxDataFormat &format );
|
||||
wxDataFormat( const wxDataFormat &format );
|
||||
wxDataFormat( const GdkAtom atom );
|
||||
|
||||
void SetType( wxDataFormatId type );
|
||||
@@ -62,6 +62,12 @@ public:
|
||||
GdkAtom GetAtom();
|
||||
void SetAtom(GdkAtom atom) { m_hasAtom = TRUE; m_atom = atom; }
|
||||
|
||||
// implicit conversion to wxDataFormatId
|
||||
operator wxDataFormatId() const { return m_type; }
|
||||
|
||||
bool operator==(wxDataFormatId type) const { return m_type == type; }
|
||||
bool operator!=(wxDataFormatId type) const { return m_type != type; }
|
||||
|
||||
private:
|
||||
wxDataFormatId m_type;
|
||||
wxString m_id;
|
||||
@@ -96,7 +102,7 @@ private:
|
||||
virtual wxDataFormat &GetNthFormat( size_t nth ) const;
|
||||
|
||||
/* return preferrd/best supported format */
|
||||
virtual wxDataFormat &GetPreferredFormat() const;
|
||||
virtual wxDataFormatId GetPreferredFormat() const;
|
||||
|
||||
/* search through m_dataObjects, return TRUE if found */
|
||||
virtual bool IsSupportedFormat( wxDataFormat &format ) const;
|
||||
|
Reference in New Issue
Block a user