// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "combobox.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
case WM_KEYUP:
case WM_KEYDOWN:
case WM_CHAR:
+ case WM_SYSCHAR:
+ case WM_SYSKEYDOWN:
+ case WM_SYSKEYUP:
case WM_SETFOCUS:
case WM_KILLFOCUS:
{
WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{
- // handle WM_CTLCOLOR messages from our EDIT control to be able to set its
- // colour correctly (to be the same as our own one)
+ // TODO: handle WM_CTLCOLOR messages from our EDIT control to be able to
+ // set its colour correctly (to be the same as our own one)
+
switch ( nMsg )
{
case CB_SETCURSEL:
// Selection was set with SetSelection. Update the value too.
if ((int)wParam > GetCount())
- m_value = wxEmptyString;
+ m_value.clear();
else
m_value = GetString(wParam);
m_selectionOld = -1;
break;
+
+ case WM_SIZE:
+ // wxStaticBox can generate this message, when modifying the control's style.
+ // This causes the content of the combobox to be selected, for some reason.
+ case WM_STYLECHANGED:
+ {
+ // combobox selection sometimes spontaneously changes when its
+ // size changes, restore it to the old value if necessary
+ long fromOld, toOld;
+ GetSelection(&fromOld, &toOld);
+ WXLRESULT result = wxChoice::MSWWindowProc(nMsg, wParam, lParam);
+
+ long fromNew, toNew;
+ GetSelection(&fromNew, &toNew);
+
+ if ( fromOld != fromNew || toOld != toNew )
+ {
+ SetSelection(fromOld, toOld);
+ }
+
+ return result;
+ }
}
return wxChoice::MSWWindowProc(nMsg, wParam, lParam);
return true;
}
}
+ // fall through
+ case WM_SYSCHAR:
return HandleChar(wParam, lParam, true /* isASCII */);
+ case WM_SYSKEYDOWN:
case WM_KEYDOWN:
return HandleKeyDown(wParam, lParam);
+ case WM_SYSKEYUP:
case WM_KEYUP:
return HandleKeyUp(wParam, lParam);
return false;
}
-bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
+bool wxComboBox::MSWCommand(WXUINT param, WXWORD id)
{
wxString value;
int sel = -1;
switch ( param )
{
+ case CBN_SELENDOK:
case CBN_SELCHANGE:
sel = GetSelection();
- // somehow we get 2 CBN_SELCHANGE events with the same index when
- // the user selects an item in the combobox -- ignore duplicates
+ // we may sometimes get 2 CBN_SELCHANGE events or a CBN_SELENDOK
+ // before CBN_SELCHANGE with the same index when the user selects
+ // an item in the combobox -- ignore duplicates
if ( sel > -1 && sel != m_selectionOld )
{
m_selectionOld = sel;
ProcessCommand(event);
}
break;
+
+ default:
+ return wxChoice::MSWCommand(param, id);
}
- // there is no return value for the CBN_ notifications, so always return
- // false from here to pass the message to DefWindowProc()
+ // let the def window proc have it by returning false, but do not pass the
+ // message we've already handled here (notably CBN_SELCHANGE) to the base
+ // class as it would generate another event for them
return false;
}
(style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
);
+ // usually WS_TABSTOP is added by wxControl::MSWGetStyle() but as we're
+ // created hidden (see Create() above), it is not done for us but we still
+ // want to have this style
+ msStyle |= WS_TABSTOP;
+
// remove the style always added by wxChoice
msStyle &= ~CBS_DROPDOWNLIST;
return msStyle;
}
-// ----------------------------------------------------------------------------
-// wxComboBox geometry
-// ----------------------------------------------------------------------------
-
-void
-wxComboBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
- // work around a Windows bug (search for "Bug in Windows Combobox" in
- // Google Groups): resizing the combobox changes the selection in it
- long fromOld, toOld;
- GetSelection(&fromOld, &toOld);
-
- wxChoice::DoSetSize(x, y, width, height, sizeFlags);
-
- long fromNew, toNew;
- GetSelection(&fromNew, &toNew);
-
- if ( fromOld != fromNew || toOld != toNew )
- {
- SetSelection(fromOld, toOld);
- }
-}
-
// ----------------------------------------------------------------------------
// wxComboBox text control-like methods
// ----------------------------------------------------------------------------
bool wxComboBox::CanUndo() const
{
+ if (!IsEditable())
+ return false;
+
HWND hEditWnd = (HWND) GetEditHWND() ;
if ( hEditWnd )
return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;
bool wxComboBox::CanRedo() const
{
+ if (!IsEditable())
+ return false;
+
HWND hEditWnd = (HWND) GetEditHWND() ;
if ( hEditWnd )
return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;
bool wxComboBox::CanCut() const
{
- return CanCopy() && IsEditable();
+ return IsEditable() && CanCopy() ;
}
bool wxComboBox::CanPaste() const
long wxComboBox::GetInsertionPoint() const
{
- // CB_GETEDITSEL returns the index of the last character after selection in
- // its high-order word
+ // CB_GETEDITSEL returns the index of the first character of the selection in
+ // its low-order word
DWORD pos= (DWORD)::SendMessage(GetHwnd(), CB_GETEDITSEL, 0, 0L);
-
- return HIWORD(pos);
+ return LOWORD(pos);
}
wxTextPos wxComboBox::GetLastPosition() const
// Paste into edit control
SendMessage(GetHwnd(), WM_PASTE, (WPARAM)0, (LPARAM)0L);
+#else
+ wxUnusedVar(from);
+ wxUnusedVar(to);
+ wxUnusedVar(value);
#endif
}
return wxChoice::GetSelection();
}
+void wxComboBox::Clear()
+{
+ wxChoice::Clear();
+ m_selectionOld = -1;
+ m_value.clear();
+}
+
+// ----------------------------------------------------------------------------
+// overridden wxChoice methods
+// ----------------------------------------------------------------------------
+
+void wxComboBox::SetSelection(int n)
+{
+ wxChoice::SetSelection(n);
+ m_selectionOld = n;
+}
+
// ----------------------------------------------------------------------------
// standard event handling
// ----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff