Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initialize wxImageFileProperty correctly when file is given in the ctor.

Browse Source 
Previously the file had to be specified later and the value passed to the ctor
was ignored.

Closes #15456.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-08-29 20:44:58 +00:00
parent 66c2bf7b1d
commit 8cf4b0651f
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/propgrid/advprops.h
View File

@@ -329,6 +329,10 @@ public:
protected: protected:
wxBitmap* m_pBitmap; // final thumbnail area wxBitmap* m_pBitmap; // final thumbnail area
wxImage* m_pImage; // intermediate thumbnail area wxImage* m_pImage; // intermediate thumbnail area
private:
// Initialize m_pImage using the current file name.
void LoadImageFromFile();
}; };
#endif #endif

7
src/propgrid/advprops.cpp
View File

@@ -1827,6 +1827,8 @@ wxImageFileProperty::wxImageFileProperty( const wxString& label, const wxString&
m_pImage = NULL; m_pImage = NULL;
m_pBitmap = NULL; m_pBitmap = NULL;
LoadImageFromFile();
} }
wxImageFileProperty::~wxImageFileProperty() wxImageFileProperty::~wxImageFileProperty()
@@ -1845,6 +1847,11 @@ void wxImageFileProperty::OnSetValue()
wxDELETE(m_pImage); wxDELETE(m_pImage);
wxDELETE(m_pBitmap); wxDELETE(m_pBitmap);
LoadImageFromFile();
}
void wxImageFileProperty::LoadImageFromFile()
{
wxFileName filename = GetFileName(); wxFileName filename = GetFileName();
// Create the image thumbnail // Create the image thumbnail