#endif
#include "wx/clipbrd.h"
+#include "wx/dynlib.h"
+#include "wx/wupdlock.h"
#include "wx/msw/private.h"
+#if wxUSE_UXTHEME
+ #include "wx/msw/uxtheme.h"
+#endif
+
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
#endif // wxUSE_TOOLTIPS
// wxWin macros
// ----------------------------------------------------------------------------
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxComboBoxStyle )
-
-wxBEGIN_FLAGS( wxComboBoxStyle )
- // new style border flags, we put them first to
- // use them for streaming out
- wxFLAGS_MEMBER(wxBORDER_SIMPLE)
- wxFLAGS_MEMBER(wxBORDER_SUNKEN)
- wxFLAGS_MEMBER(wxBORDER_DOUBLE)
- wxFLAGS_MEMBER(wxBORDER_RAISED)
- wxFLAGS_MEMBER(wxBORDER_STATIC)
- wxFLAGS_MEMBER(wxBORDER_NONE)
-
- // old style border flags
- wxFLAGS_MEMBER(wxSIMPLE_BORDER)
- wxFLAGS_MEMBER(wxSUNKEN_BORDER)
- wxFLAGS_MEMBER(wxDOUBLE_BORDER)
- wxFLAGS_MEMBER(wxRAISED_BORDER)
- wxFLAGS_MEMBER(wxSTATIC_BORDER)
- wxFLAGS_MEMBER(wxBORDER)
-
- // standard window styles
- wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
- wxFLAGS_MEMBER(wxCLIP_CHILDREN)
- wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
- wxFLAGS_MEMBER(wxWANTS_CHARS)
- wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
- wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
- wxFLAGS_MEMBER(wxVSCROLL)
- wxFLAGS_MEMBER(wxHSCROLL)
-
- wxFLAGS_MEMBER(wxCB_SIMPLE)
- wxFLAGS_MEMBER(wxCB_SORT)
- wxFLAGS_MEMBER(wxCB_READONLY)
- wxFLAGS_MEMBER(wxCB_DROPDOWN)
-
-wxEND_FLAGS( wxComboBoxStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxChoice,"wx/combobox.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxComboBox)
- wxEVENT_PROPERTY( Select , wxEVT_COMMAND_COMBOBOX_SELECTED , wxCommandEvent )
- wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
-
- // TODO DELEGATES
- wxPROPERTY( Font , wxFont , SetFont , GetFont , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY( Value ,wxString, SetValue, GetValue, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY( Selection ,int, SetSelection, GetSelection, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY_FLAGS( WindowStyle , wxComboBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxComboBox)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size )
-
-#else
-
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxChoice)
-
-#endif
-
BEGIN_EVENT_TABLE(wxComboBox, wxControl)
EVT_MENU(wxID_CUT, wxComboBox::OnCut)
EVT_MENU(wxID_COPY, wxComboBox::OnCopy)
// longer, check for it to avoid bogus assert failures
if ( !win->IsBeingDeleted() )
{
- wxFAIL_MSG( _T("should have combo as parent") );
+ wxFAIL_MSG( wxT("should have combo as parent") );
}
}
else if ( combo->MSWProcessEditMsg(message, wParam, lParam) )
case WM_GETDLGCODE:
{
- wxCHECK_MSG( win, 0, _T("should have a parent") );
+ wxCHECK_MSG( win, 0, wxT("should have a parent") );
if ( win->GetWindowStyle() & wxTE_PROCESS_ENTER )
{
}
}
break;
-
- case WM_CUT:
- case WM_COPY:
- case WM_PASTE:
- if( win->HandleClipboardEvent( message ) )
- return 0;
- break;
}
return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam);
long fromOld, toOld;
GetSelection(&fromOld, &toOld);
+
+ // if an editable combobox has a not empty text not from the
+ // list, it tries to autocomplete it from the list when it is
+ // resized, but we don't want this to happen as it doesn't seem
+ // to make any sense, so we forcefully restore the old text
+ wxString textOld;
+ if ( !HasFlag(wxCB_READONLY) && GetCurrentSelection() == -1 )
+ textOld = GetValue();
+
+ // eliminate flickering during following hacks
+ wxWindowUpdateLocker lock(this);
+
WXLRESULT result = wxChoice::MSWWindowProc(nMsg, wParam, lParam);
+ if ( !textOld.empty() && GetValue() != textOld )
+ SetLabel(textOld);
+
long fromNew, toNew;
GetSelection(&fromNew, &toNew);
// fall through
case WM_SYSCHAR:
- return HandleChar(wParam, lParam, true /* isASCII */);
+ return HandleChar(wParam, lParam);
case WM_SYSKEYDOWN:
case WM_KEYDOWN:
case WM_KILLFOCUS:
return HandleKillFocus((WXHWND)wParam);
+
+ case WM_CUT:
+ case WM_COPY:
+ case WM_PASTE:
+ return HandleClipboardEvent(msg);
}
return false;
switch ( param )
{
+ 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());
+ event.SetEventObject(this);
+ ProcessCommand(event);
+ }
+ break;
+ case CBN_CLOSEUP:
+ {
+ wxCommandEvent event(wxEVT_COMMAND_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
// logical as the text does change)
case CBN_EDITCHANGE:
+ if ( m_allowTextEvents )
{
wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
}
// skip wxChoice version as it would generate its own events for
- // CBN_SELENDOK
+ // CBN_SELENDOK and also interfere with our handling of CBN_DROPDOWN
return true;
}
WXHWND wxComboBox::GetEditHWNDIfAvailable() const
{
- POINT pt = { 4, 4 };
- WXHWND hWndEdit = (WXHWND)::ChildWindowFromPoint(GetHwnd(), pt);
- if ( hWndEdit == GetHWND() )
- hWndEdit = NULL;
+#if wxUSE_DYNLIB_CLASS
+#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);
+ }
- return hWndEdit;
+ if ( s_pfnGetComboBoxInfo )
+ {
+ WinStruct<COMBOBOXINFO> info;
+ (*s_pfnGetComboBoxInfo)(GetHwnd(), &info);
+ return info.hwndItem;
+ }
+#endif // WINVER >= 0x0500
+#endif // wxUSE_DYNLIB_CLASS
+
+ if (HasFlag(wxCB_SIMPLE))
+ {
+ POINT pt;
+ pt.x = pt.y = 4;
+ return (WXHWND) ::ChildWindowFromPoint(GetHwnd(), pt);
+ }
+
+ // notice that a slightly safer alternative could be to use FindWindowEx()
+ // but it's not available under WinCE so just take the first child for now
+ // to keep one version of the code for all platforms and fix it later if
+ // problems are discovered
+
+ // we assume that the only child of the combobox is the edit window
+ return (WXHWND)::GetWindow(GetHwnd(), GW_CHILD);
}
WXHWND wxComboBox::GetEditHWND() const
// this function should not be called for wxCB_READONLY controls, it is
// the callers responsibility to check this
wxASSERT_MSG( !HasFlag(wxCB_READONLY),
- _T("read-only combobox doesn't have any edit control") );
+ wxT("read-only combobox doesn't have any edit control") );
WXHWND hWndEdit = GetEditHWNDIfAvailable();
- wxASSERT_MSG( hWndEdit, _T("combobox without edit control?") );
+ wxASSERT_MSG( hWndEdit, wxT("combobox without edit control?") );
return hWndEdit;
}
+wxWindow *wxComboBox::GetEditableWindow()
+{
+ wxASSERT_MSG( !HasFlag(wxCB_READONLY),
+ wxT("read-only combobox doesn't have any edit control") );
+
+ return this;
+}
+
// ----------------------------------------------------------------------------
// wxComboBox creation
// ----------------------------------------------------------------------------
void wxComboBox::OnDelete(wxCommandEvent& WXUNUSED(event))
{
- long from, to;
- GetSelection(& from, & to);
- if (from != -1 && to != -1)
- Remove(from, to);
+ RemoveSelection();
}
void wxComboBox::OnSelectAll(wxCommandEvent& WXUNUSED(event))
{
- SetSelection(-1, -1);
+ SelectAll();
}
void wxComboBox::OnUpdateCut(wxUpdateUIEvent& event)
void wxComboBox::OnUpdateUndo(wxUpdateUIEvent& event)
{
- event.Enable( CanUndo() );
+ event.Enable( IsEditable() && CanUndo() );
}
void wxComboBox::OnUpdateRedo(wxUpdateUIEvent& event)
{
- event.Enable( CanRedo() );
+ event.Enable( IsEditable() && CanRedo() );
}
void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event)
void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
{
- event.Enable(IsEditable() && GetLastPosition() > 0);
+ event.Enable(IsEditable() && !wxTextEntry::IsEmpty());
}
#if wxUSE_TOOLTIPS
wxChoice::DoSetToolTip(tip);
if ( tip && !HasFlag(wxCB_READONLY) )
- tip->Add(GetEditHWND());
+ tip->AddOtherWindow(GetEditHWND());
}
#endif // wxUSE_TOOLTIPS
+#if wxUSE_UXTHEME
+
+bool wxComboBox::SetHint(const wxString& hintOrig)
+{
+ wxString hint(hintOrig);
+ if ( wxUxThemeEngine::GetIfActive() )
+ {
+ // under XP (but not Vista) there is a bug in cue banners
+ // implementation for combobox edit control: the first character is
+ // partially chopped off, so prepend a space to make it fully visible
+ hint.insert(0, " ");
+ }
+
+ return wxTextEntry::SetHint(hint);
+}
+
+#endif // wxUSE_UXTHEME
+
#endif // wxUSE_COMBOBOX
projects / wxWidgets.git / blobdiff