#include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#include "wx/settings.h"
#include "wx/log.h"
- // for wxEVT_COMMAND_TEXT_ENTER
+ // for wxEVT_TEXT_ENTER
#include "wx/textctrl.h"
#include "wx/app.h"
#include "wx/brush.h"
#endif
#include "wx/clipbrd.h"
-#include "wx/dynlib.h"
#include "wx/wupdlock.h"
#include "wx/msw/private.h"
// implementation
// ============================================================================
+namespace
+{
+
+// Check if the given message should be forwarded from the edit control which
+// is part of the combobox to wxComboBox itself. All messages generating the
+// events that the code using wxComboBox could be interested in must be
+// forwarded.
+bool ShouldForwardFromEditToCombo(UINT message)
+{
+ switch ( message )
+ {
+ case WM_KEYUP:
+ case WM_KEYDOWN:
+ case WM_CHAR:
+ case WM_SYSCHAR:
+ case WM_SYSKEYDOWN:
+ case WM_SYSKEYUP:
+ case WM_SETFOCUS:
+ case WM_KILLFOCUS:
+ case WM_CUT:
+ case WM_COPY:
+ case WM_PASTE:
+ return true;
+ }
+
+ return false;
+}
+
+} // anonymous namespace
+
// ----------------------------------------------------------------------------
// wnd proc for subclassed edit control
// ----------------------------------------------------------------------------
HWND hwndCombo = ::GetParent(hWnd);
wxWindow *win = wxFindWinFromHandle((WXHWND)hwndCombo);
- switch ( message )
+ if ( ShouldForwardFromEditToCombo(message) )
{
- // forward some messages to the combobox to generate the appropriate
- // wxEvents from them
- case WM_KEYUP:
- case WM_KEYDOWN:
- case WM_CHAR:
- case WM_SYSCHAR:
- case WM_SYSKEYDOWN:
- case WM_SYSKEYUP:
- case WM_SETFOCUS:
- case WM_KILLFOCUS:
+ wxComboBox *combo = wxDynamicCast(win, wxComboBox);
+ if ( !combo )
+ {
+ // we can get WM_KILLFOCUS while our parent is already half
+ // destroyed and hence doesn't look like a combobx any
+ // longer, check for it to avoid bogus assert failures
+ if ( !win->IsBeingDeleted() )
{
- wxComboBox *combo = wxDynamicCast(win, wxComboBox);
- if ( !combo )
- {
- // we can get WM_KILLFOCUS while our parent is already half
- // destroyed and hence doesn't look like a combobx any
- // longer, check for it to avoid bogus assert failures
- if ( !win->IsBeingDeleted() )
- {
- wxFAIL_MSG( wxT("should have combo as parent") );
- }
- }
- else if ( combo->MSWProcessEditMsg(message, wParam, lParam) )
- {
- // handled by parent
- return 0;
- }
+ wxFAIL_MSG( wxT("should have combo as parent") );
}
- break;
-
- case WM_GETDLGCODE:
- {
- wxCHECK_MSG( win, 0, wxT("should have a parent") );
+ }
+ else if ( combo->MSWProcessEditMsg(message, wParam, lParam) )
+ {
+ // handled by parent
+ return 0;
+ }
+ }
+ else if ( message == WM_GETDLGCODE )
+ {
+ wxCHECK_MSG( win, 0, wxT("should have a parent") );
- if ( win->GetWindowStyle() & wxTE_PROCESS_ENTER )
- {
- // need to return a custom dlg code or we'll never get it
- return DLGC_WANTMESSAGE;
- }
- }
- break;
+ if ( win->GetWindowStyle() & wxTE_PROCESS_ENTER )
+ {
+ // need to return a custom dlg code or we'll never get it
+ return DLGC_WANTMESSAGE;
+ }
}
return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam);
if (SendMessage(GetHwnd(), CB_GETDROPPEDSTATE, 0, 0))
return false;
- wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
+ wxCommandEvent event(wxEVT_TEXT_ENTER, m_windowId);
const int sel = GetSelection();
event.SetInt(sel);
return true;
}
}
- // fall through
-
- case WM_SYSCHAR:
- return HandleChar(wParam, lParam);
-
- case WM_SYSKEYDOWN:
- case WM_KEYDOWN:
- return HandleKeyDown(wParam, lParam);
-
- case WM_SYSKEYUP:
- case WM_KEYUP:
- return HandleKeyUp(wParam, lParam);
-
- case WM_SETFOCUS:
- return HandleSetFocus((WXHWND)wParam);
-
- case WM_KILLFOCUS:
- return HandleKillFocus((WXHWND)wParam);
+ // fall through, WM_CHAR is one of the message we should forward.
- case WM_CUT:
- case WM_COPY:
- case WM_PASTE:
- return HandleClipboardEvent(msg);
+ default:
+ if ( ShouldForwardFromEditToCombo(msg) )
+ {
+ // For all the messages forward from the edit control the
+ // result is not used.
+ WXLRESULT result;
+ return MSWHandleMessage(&result, msg, wParam, lParam);
+ }
}
return false;
case CBN_DROPDOWN:
// remember the last selection, just as wxChoice does
m_lastAcceptedSelection = GetCurrentSelection();
- if ( m_lastAcceptedSelection == -1 )
- {
- // but unlike with wxChoice we may have no selection but still
- // have some text and we should avoid erasing it if the drop
- // down is cancelled (see #8474)
- m_lastAcceptedSelection = wxID_NONE;
- }
{
- wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_DROPDOWN, GetId());
+ wxCommandEvent event(wxEVT_COMBOBOX_DROPDOWN, GetId());
event.SetEventObject(this);
ProcessCommand(event);
}
break;
+
case CBN_CLOSEUP:
+ // Do the same thing as in wxChoice but using different event type.
+ if ( m_pendingSelection != wxID_NONE )
+ {
+ SendSelectionChangedEvent(wxEVT_COMBOBOX);
+ m_pendingSelection = wxID_NONE;
+ }
{
- wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_CLOSEUP, GetId());
+ wxCommandEvent event(wxEVT_COMBOBOX_CLOSEUP, GetId());
event.SetEventObject(this);
ProcessCommand(event);
}
break;
+
case CBN_SELENDOK:
#ifndef __SMARTPHONE__
// we need to reset this to prevent the selection from being undone
// could get a wrong value when it calls our GetValue()
::SetWindowText(GetHwnd(), value.t_str());
- {
- wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, GetId());
- event.SetInt(sel);
- event.SetString(value);
- InitCommandEventWithItems(event, sel);
-
- ProcessCommand(event);
- }
+ SendSelectionChangedEvent(wxEVT_COMBOBOX);
- // fall through: for compability with wxGTK, also send the text
+ // fall through: for compatibility with wxGTK, also send the text
// update event when the selection changes (this also seems more
// logical as the text does change)
case CBN_EDITCHANGE:
if ( m_allowTextEvents )
{
- wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
+ wxCommandEvent event(wxEVT_TEXT, GetId());
// if sel != -1, value was already initialized above
if ( sel == -1 )
WXHWND wxComboBox::GetEditHWNDIfAvailable() const
{
-#if wxUSE_DYNLIB_CLASS
+ // FIXME-VC6: Only VC6 needs this guard, see WINVER definition in
+ // include/wx/msw/wrapwin.h
#if defined(WINVER) && WINVER >= 0x0500
- typedef BOOL (WINAPI *GetComboBoxInfo_t)(HWND, COMBOBOXINFO*);
- static GetComboBoxInfo_t s_pfnGetComboBoxInfo = NULL;
- static bool s_triedToLoad = false;
- if ( !s_triedToLoad )
- {
- s_triedToLoad = true;
- wxLoadedDLL dllUser32("user32.dll");
- wxDL_INIT_FUNC(s_pfn, GetComboBoxInfo, dllUser32);
- }
-
- if ( s_pfnGetComboBoxInfo )
- {
- WinStruct<COMBOBOXINFO> info;
- (*s_pfnGetComboBoxInfo)(GetHwnd(), &info);
+ WinStruct<COMBOBOXINFO> info;
+ if ( MSWGetComboBoxInfo(&info) )
return info.hwndItem;
- }
#endif // WINVER >= 0x0500
-#endif // wxUSE_DYNLIB_CLASS
if (HasFlag(wxCB_SIMPLE))
{
wxTextEntry::Clear();
}
+bool wxComboBox::ContainsHWND(WXHWND hWnd) const
+{
+ return hWnd == GetEditHWNDIfAvailable();
+}
+
void wxComboBox::GetSelection(long *from, long *to) const
{
if ( !HasFlag(wxCB_READONLY) )
#endif // wxUSE_UXTHEME
+wxSize wxComboBox::DoGetSizeFromTextSize(int xlen, int ylen) const
+{
+ wxSize tsize( wxChoice::DoGetSizeFromTextSize(xlen, ylen) );
+
+ if ( !HasFlag(wxCB_READONLY) )
+ {
+ // Add the margins we have previously set
+ wxPoint marg( GetMargins() );
+ marg.x = wxMax(0, marg.x);
+ marg.y = wxMax(0, marg.y);
+ tsize.IncBy( marg );
+ }
+
+ return tsize;
+}
+
#endif // wxUSE_COMBOBOX
projects / wxWidgets.git / blobdiff