// ----------------------------------------------------------------------------
#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, wxControl,"wx/combobox.h")
-WX_BEGIN_PROPERTIES_TABLE(wxComboBox)
+wxBEGIN_PROPERTIES_TABLE(wxComboBox)
+ wxEVENT_PROPERTY( Select , wxEVT_COMMAND_COMBOBOX_SELECTED , wxCommandEvent )
+ wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
+
// TODO DELEGATES
- WX_PROPERTY( Font , wxFont , SetFont , GetFont , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- WX_PROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- WX_PROPERTY( Value ,wxString, SetValue, GetValue, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- WX_PROPERTY( Selection ,int, SetSelection, GetSelection, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-WX_END_PROPERTIES_TABLE()
+ wxPROPERTY( Font , wxFont , SetFont , GetFont , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY( Value ,wxString, SetValue, GetValue, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY( Selection ,int, SetSelection, GetSelection, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY_FLAGS( WindowStyle , wxComboBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
-WX_BEGIN_HANDLERS_TABLE(wxComboBox)
-WX_END_HANDLERS_TABLE()
+wxBEGIN_HANDLERS_TABLE(wxComboBox)
+wxEND_HANDLERS_TABLE()
-WX_CONSTRUCTOR_5( wxComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size )
+wxCONSTRUCTOR_5( wxComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size )
#else
IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
#endif
// ---------------------------------------------------------------------------
// the pointer to standard radio button wnd proc
-static WXFARPROC gs_wndprocEdit = (WXFARPROC)NULL;
+static WNDPROC gs_wndprocEdit = (WNDPROC)NULL;
// ============================================================================
// implementation
return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam);
}
-WXHBRUSH wxComboBox::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
- WXUINT WXUNUSED(message),
- WXWPARAM WXUNUSED(wParam),
- WXLPARAM WXUNUSED(lParam)
- )
+WXHBRUSH wxComboBox::OnCtlColor(WXHDC pDC,
+ WXHWND WXUNUSED(pWnd),
+ WXUINT WXUNUSED(nCtlColor),
+ WXUINT WXUNUSED(message),
+ WXWPARAM WXUNUSED(wParam),
+ WXLPARAM WXUNUSED(lParam))
{
HDC hdc = (HDC)pDC;
wxColour colBack = GetBackgroundColour();
}
// ----------------------------------------------------------------------------
-// wxComboBox
+// wxComboBox callbacks
// ----------------------------------------------------------------------------
+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)
+ switch ( nMsg )
+ {
+ // we have to handle both: one for the normal case and the other for
+ // wxCB_READONLY
+ case WM_CTLCOLOREDIT:
+ case WM_CTLCOLORSTATIC:
+ WXWORD nCtlColor;
+ WXHDC hdc;
+ WXHWND hwnd;
+ UnpackCtlColor(wParam, lParam, &nCtlColor, &hdc, &hwnd);
+
+ return (WXLRESULT)OnCtlColor(hdc, hwnd, nCtlColor, nMsg, wParam, lParam);
+ }
+
+ return wxChoice::MSWWindowProc(nMsg, wParam, lParam);
+}
+
bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
{
switch ( msg )
}
else // we're synthesizing text updated event from sel change
{
+ // We need to retrieve the current selection because the user
+ // may have changed it in the previous handler (for CBN_SELCHANGE
+ // above).
+ sel = GetSelection();
+ if ( sel > -1 )
+ {
+ value = GetString(sel);
+ }
// we need to do this because the user code expects
// wxComboBox::GetValue() to return the new value from
// "text updated" handler but it hadn't been updated yet
return (WXHWND)hwndEdit;
}
+// ----------------------------------------------------------------------------
+// wxComboBox creation
+// ----------------------------------------------------------------------------
+
bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
const wxString& value,
const wxPoint& pos,
// some noticeable flicker while the control rearranges itself
m_isShown = FALSE;
- // first create wxWin object
- if ( !CreateControl(parent, id, pos, size, style, validator, name) )
+ if ( !CreateAndInit(parent, id, pos, size, n, choices, style,
+ validator, name) )
return FALSE;
- // get the right style
- long msStyle = WS_TABSTOP | WS_VSCROLL | WS_HSCROLL |
- CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT /* | WS_CLIPSIBLINGS */;
- if ( style & wxCB_READONLY )
- msStyle |= CBS_DROPDOWNLIST;
-#ifndef __WXWINCE__
- else if ( style & wxCB_SIMPLE )
- msStyle |= CBS_SIMPLE; // A list (shown always) and edit control
-#endif
- else
- msStyle |= CBS_DROPDOWN;
-
- if ( style & wxCB_SORT )
- msStyle |= CBS_SORT;
-
- if ( style & wxCLIP_SIBLINGS )
- msStyle |= WS_CLIPSIBLINGS;
-
-
- // and now create the MSW control
- if ( !MSWCreateControl(_T("COMBOBOX"), msStyle) )
- return FALSE;
-
- // A choice/combobox normally has a white background (or other, depending
- // on global settings) rather than inheriting the parent's background colour.
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-
- for ( int i = 0; i < n; i++ )
- {
- Append(choices[i]);
- }
-
- if ( !value.IsEmpty() )
- {
+ // we shouldn't call SetValue() for an empty string because this would
+ // (correctly) result in an assert with a read only combobox and is useless
+ // for the other ones anyhow
+ if ( !value.empty() )
SetValue(value);
- }
-
- // do this after appending the values to the combobox so that autosizing
- // works correctly
- SetSize(pos.x, pos.y, size.x, size.y);
// a (not read only) combobox is, in fact, 2 controls: the combobox itself
// and an edit control inside it and if we want to catch events from this
// edit control, we must subclass it as well
if ( !(style & wxCB_READONLY) )
{
- gs_wndprocEdit = (WXFARPROC)::SetWindowLong
- (
- (HWND)GetEditHWND(),
- GWL_WNDPROC,
- (LPARAM)wxComboEditWndProc
- );
+ gs_wndprocEdit = wxSetWindowProc((HWND)GetEditHWND(),
+ wxComboEditWndProc);
}
// and finally, show the control
return TRUE;
}
+bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
+ const wxString& value,
+ const wxPoint& pos,
+ const wxSize& size,
+ const wxArrayString& choices,
+ long style,
+ const wxValidator& validator,
+ const wxString& name)
+{
+ wxCArrayString chs(choices);
+ return Create(parent, id, value, pos, size, chs.GetCount(),
+ chs.GetStrings(), style, validator, name);
+}
+
+WXDWORD wxComboBox::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+ // we never have an external border
+ WXDWORD msStyle = wxChoice::MSWGetStyle
+ (
+ (style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
+ );
+
+ // remove the style always added by wxChoice
+ msStyle &= ~CBS_DROPDOWNLIST;
+
+ if ( style & wxCB_READONLY )
+ msStyle |= CBS_DROPDOWNLIST;
+#ifndef __WXWINCE__
+ else if ( style & wxCB_SIMPLE )
+ msStyle |= CBS_SIMPLE; // A list (shown always) and edit control
+#endif
+ else
+ msStyle |= CBS_DROPDOWN;
+
+ // there is no reason to not always use CBS_AUTOHSCROLL, so do use it
+ msStyle |= CBS_AUTOHSCROLL;
+
+ // NB: we used to also add CBS_NOINTEGRALHEIGHT here but why?
+
+ return msStyle;
+}
+
+// ----------------------------------------------------------------------------
+// wxComboBox text control-like methods
+// ----------------------------------------------------------------------------
+
void wxComboBox::SetValue(const wxString& value)
{
if ( HasFlag(wxCB_READONLY) )
toChar = -1;
}
- if (
-#ifdef __WIN32__
- SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar))
-#else // Win16
- SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)fromChar, (LPARAM)toChar)
-#endif
- == CB_ERR )
+ if ( SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar)) == CB_ERR )
{
wxLogDebug(_T("CB_SETEDITSEL failed"));
}
}
-#endif
- // wxUSE_COMBOBOX
+#endif // wxUSE_COMBOBOX
projects / wxWidgets.git / blobdiff