Document changes in wxImageFileProperty
Remove references to the non-public member variables from documentation.
This commit is contained in:
@@ -234,6 +234,13 @@ Changes in behaviour which may result in build errors
|
|||||||
3.1.7: (released 2022-??-??)
|
3.1.7: (released 2022-??-??)
|
||||||
----------------------------
|
----------------------------
|
||||||
|
|
||||||
|
INCOMPATIBLE CHANGES SINCE 3.1.6:
|
||||||
|
|
||||||
|
- wxImageFileProperty::m_pImage and m_pBitmap member variables were removed.
|
||||||
|
They were not intended for the public API. m_image variable represents
|
||||||
|
cached image now.
|
||||||
|
|
||||||
|
|
||||||
NOTE: This file is updated only before the release, please use
|
NOTE: This file is updated only before the release, please use
|
||||||
|
|
||||||
$ git log --notes=changelog --format='%N' v3.1.6..|grep .
|
$ git log --notes=changelog --format='%N' v3.1.6..|grep .
|
||||||
|
|||||||
@@ -296,12 +296,14 @@ public:
|
|||||||
const wxRect& rect, wxPGPaintData& paintdata ) wxOVERRIDE;
|
const wxRect& rect, wxPGPaintData& paintdata ) wxOVERRIDE;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
wxBitmap m_bitmap; // final thumbnail area
|
void SetImage(const wxImage& img);
|
||||||
wxImage m_image; // original thumbnail area
|
wxImage m_image; // original thumbnail area
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// Initialize m_image using the current file name.
|
// Initialize m_image using the current file name.
|
||||||
void LoadImageFromFile();
|
void LoadImageFromFile();
|
||||||
|
|
||||||
|
wxBitmap m_bitmap; // final thumbnail area
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -248,10 +248,6 @@ public:
|
|||||||
virtual wxSize OnMeasureImage( int item ) const;
|
virtual wxSize OnMeasureImage( int item ) const;
|
||||||
virtual void OnCustomPaint( wxDC& dc,
|
virtual void OnCustomPaint( wxDC& dc,
|
||||||
const wxRect& rect, wxPGPaintData& paintdata );
|
const wxRect& rect, wxPGPaintData& paintdata );
|
||||||
|
|
||||||
protected:
|
|
||||||
wxBitmap m_bitmap; // final thumbnail area
|
|
||||||
wxImage m_image; // original thumbnail area
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1850,17 +1850,22 @@ void wxImageFileProperty::OnSetValue()
|
|||||||
wxFileProperty::OnSetValue();
|
wxFileProperty::OnSetValue();
|
||||||
|
|
||||||
// Delete old image
|
// Delete old image
|
||||||
m_image = wxNullImage;
|
SetImage(wxNullImage);
|
||||||
m_bitmap = wxNullBitmap;
|
|
||||||
|
|
||||||
LoadImageFromFile();
|
LoadImageFromFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wxImageFileProperty::SetImage(const wxImage& img)
|
||||||
|
{
|
||||||
|
m_image = img;
|
||||||
|
m_bitmap = wxNullBitmap;
|
||||||
|
}
|
||||||
|
|
||||||
void wxImageFileProperty::LoadImageFromFile()
|
void wxImageFileProperty::LoadImageFromFile()
|
||||||
{
|
{
|
||||||
wxFileName filename = GetFileName();
|
wxFileName filename = GetFileName();
|
||||||
|
|
||||||
// Create the image thumbnail
|
// Cache the image
|
||||||
if ( filename.FileExists() )
|
if ( filename.FileExists() )
|
||||||
{
|
{
|
||||||
m_image.LoadFile(filename.GetFullPath());
|
m_image.LoadFile(filename.GetFullPath());
|
||||||
|
|||||||
Reference in New Issue
Block a user