From d67c33888f65e236adedd65ffbd978607eadc9d5 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Mon, 31 Dec 2007 20:12:42 +0000
Subject: [PATCH] Ensure AutoComp items with no type will set the item's image
 index to -1.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/stc/PlatWX.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 8de6eae436..1fc084cb15 100644
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -140,7 +140,7 @@ Font::~Font() {
 
 void Font::Create(const char *faceName, int characterSet,
                   int size, bool bold, bool italic,
-                  bool WXUNUSED(extraFontFlag)) {
+                  bool extraFontFlag) {
     Release();
 
     // The minus one is done because since Scintilla uses SC_SHARSET_DEFAULT
@@ -160,7 +160,7 @@ void Font::Create(const char *faceName, int characterSet,
                     false,
                     stc2wx(faceName),
                     encoding);
-    //font->SetNoAntiAliasing(!extraFontFlag);
+    font->SetNoAntiAliasing(!extraFontFlag);
     id = font;
 }
 
@@ -1234,13 +1234,14 @@ void ListBoxImpl::Append(char *s, int type) {
 void ListBoxImpl::Append(const wxString& text, int type) {
     long count  = GETLB(id)->GetItemCount();
     long itemID  = GETLB(id)->InsertItem(count, wxEmptyString);
+    ling idx = -1;
     GETLB(id)->SetItem(itemID, 1, text);
     maxStrWidth = wxMax(maxStrWidth, text.length());
     if (type != -1) {
         wxCHECK_RET(imgTypeMap, wxT("Unexpected NULL imgTypeMap"));
-        long idx = imgTypeMap->Item(type);
-        GETLB(id)->SetItemImage(itemID, idx, idx);
+        idx = imgTypeMap->Item(type);
     }
+    GETLB(id)->SetItemImage(itemID, idx, idx);
 }
 
 void ListBoxImpl::SetList(const char* list, char separator, char typesep) {
-- 
2.45.2