OSDN Git Service

Fix GetString error when edit at HistoryCombo
authorFrank Li <lznuaa@gmail.com>
Fri, 20 Mar 2009 05:36:00 +0000 (13:36 +0800)
committerFrank Li <lznuaa@gmail.com>
Fri, 20 Mar 2009 05:36:00 +0000 (13:36 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
src/Utils/MiscUI/HistoryCombo.cpp

index 1ea9e51..ce82cd1 100644 (file)
@@ -329,12 +329,15 @@ CString CHistoryCombo::GetString() const
        CString str;\r
        int sel;\r
        sel = GetCurSel();\r
+       DWORD style=GetStyle();\r
+       \r
        if (sel == CB_ERR)\r
        {\r
                GetWindowText(str);\r
                return str;\r
        }\r
-       if ((m_bURLHistory)||(m_bPathHistory))\r
+\r
+       if ((m_bURLHistory)||(m_bPathHistory) || (!(style&CBS_SIMPLE)) )\r
        {\r
                //URL and path history combo boxes are editable, so get\r
                //the string directly from the combobox\r