Applied patch [ 818941 ] Initialize vars and clear wxImageList

Also small speedup in wxFileIconsTable

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 28e393d1777c305ea6b5f0bdb7d2bfcfc797031f..622be49ebea643f1206a1143b7d3e1d2e0e6e869 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -1645,16 +1645,17 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
         return newid;
     }
 
         return newid;
     }
 

-    wxBitmap tmpBmp;
-    tmpBmp.CopyFromIcon(ic);
-    wxImage img = tmpBmp.ConvertToImage();
+    wxBitmap bmp;
+    bmp.CopyFromIcon(ic);

 
     int id = m_smallImageList->GetImageCount();
 
     int id = m_smallImageList->GetImageCount();

-    if (img.GetWidth() == 16 && img.GetHeight() == 16)
-        m_smallImageList->Add(wxBitmap(img));
+    if ((bmp.GetWidth() == 16) && (bmp.GetHeight() == 16))
+        m_smallImageList->Add(bmp);

     else
     {
     else
     {

-        if (img.GetWidth() != 32 || img.GetHeight() != 32)
+        wxImage img = bmp.ConvertToImage();
+
+        if ((img.GetWidth() != 32) || (img.GetHeight() != 32))

             m_smallImageList->Add(CreateAntialiasedBitmap(CutEmptyBorders(img).Rescale(32, 32)));
         else
             m_smallImageList->Add(CreateAntialiasedBitmap(img));
             m_smallImageList->Add(CreateAntialiasedBitmap(CutEmptyBorders(img).Rescale(32, 32)));
         else
             m_smallImageList->Add(CreateAntialiasedBitmap(img));

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 5fa3b027cde37fa4a2814959907d13bb3c9578a8..8aac4fa72e2940d38820025f5cd41bd321ef4b05 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -45,6 +45,7 @@ wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int in
 
 wxGenericImageList::~wxGenericImageList()
 {
 
 wxGenericImageList::~wxGenericImageList()
 {

+    (void)RemoveAll();

 }
 
 int wxGenericImageList::GetImageCount() const
 }
 
 int wxGenericImageList::GetImageCount() const

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 33b696bd23cd94633b94e7b9fda69eb673f5e45a..394e27505cde8397c53863c66c1ed48cf09b144b 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -4595,6 +4595,8 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
     m_mainWin = (wxListMainWindow*) NULL;
     m_headerWin = (wxListHeaderWindow*) NULL;
 
     m_mainWin = (wxListMainWindow*) NULL;
     m_headerWin = (wxListHeaderWindow*) NULL;
 

+    m_headerHeight = 0;
+

     if ( !(style & wxLC_MASK_TYPE) )
     {
         style = style | wxLC_LIST;
     if ( !(style & wxLC_MASK_TYPE) )
     {
         style = style | wxLC_LIST;

diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index 6f316b16ee3d326f1759a0ecd82886c405695629..8ba52502f1882389bdd021ccc26615ad03ebebcb 100644 (file)
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -273,6 +273,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
 wxClipboard::wxClipboard()
 {
     m_open = FALSE;
 wxClipboard::wxClipboard()
 {
     m_open = FALSE;

+    m_waiting = FALSE;

 
     m_ownsClipboard = FALSE;
     m_ownsPrimarySelection = FALSE;
 
     m_ownsClipboard = FALSE;
     m_ownsPrimarySelection = FALSE;

diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp
index 6f316b16ee3d326f1759a0ecd82886c405695629..8ba52502f1882389bdd021ccc26615ad03ebebcb 100644 (file)
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/clipbrd.cpp
@@ -273,6 +273,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
 wxClipboard::wxClipboard()
 {
     m_open = FALSE;
 wxClipboard::wxClipboard()
 {
     m_open = FALSE;

+    m_waiting = FALSE;

 
     m_ownsClipboard = FALSE;
     m_ownsPrimarySelection = FALSE;
 
     m_ownsClipboard = FALSE;
     m_ownsPrimarySelection = FALSE;