wxBEGIN_PROPERTIES_TABLE(wxChoice)
wxEVENT_PROPERTY( Select , wxEVT_COMMAND_CHOICE_SELECTED , wxCommandEvent )
- wxPROPERTY( Font , wxFont , SetFont , GetFont , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ 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( Selection ,int, SetSelection, GetSelection, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY_FLAGS( WindowStyle , wxChoiceStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+ wxPROPERTY( Selection ,int, SetSelection, GetSelection, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY_FLAGS( WindowStyle , wxChoiceStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
wxEND_PROPERTIES_TABLE()
wxBEGIN_HANDLERS_TABLE(wxChoice)
// creation
// ----------------------------------------------------------------------------
-wxChoice::wxChoice()
-{
-}
-
-wxChoice::wxChoice(wxWindow *parent,
- wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- int n,
- const wxString choices[],
- long style,
- const wxValidator& validator,
- const wxString& name)
-{
- Create(parent, id, pos, size, n, choices, style, validator, name);
-}
-
bool wxChoice::Create(wxWindow *parent,
wxWindowID id,
const wxPoint& pos,
const wxValidator& validator,
const wxString& name)
{
- if ( !CreateControl(parent, id, pos, size, style, validator, name) )
- return FALSE;
-
- long msStyle = WS_CHILD | CBS_DROPDOWNLIST | WS_TABSTOP | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL /* | WS_CLIPSIBLINGS */;
- if ( style & wxCB_SORT )
- msStyle |= CBS_SORT;
-
- if ( style & wxCLIP_SIBLINGS )
- msStyle |= WS_CLIPSIBLINGS;
-
-
// Experience shows that wxChoice vs. wxComboBox distinction confuses
// quite a few people - try to help them
wxASSERT_MSG( !(style & wxCB_DROPDOWN) &&
_T("this style flag is ignored by wxChoice, you ")
_T("probably want to use a wxComboBox") );
- if ( !MSWCreateControl(wxT("COMBOBOX"), msStyle) )
+ return CreateAndInit(parent, id, pos, size, n, choices, style,
+ validator, name);
+}
+
+bool wxChoice::CreateAndInit(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& sizeOrig,
+ int n, const wxString choices[],
+ long style,
+ const wxValidator& validator,
+ const wxString& name)
+{
+ // this is a bit hackish but we want to prevent MSWCreateControl() from
+ // calling SetBestSize() (which it would do if any of the size components
+ // is not given) because it wouldn't calculate it correctly if we have any
+ // strings as they're not yet added to the control when it is called
+ //
+ // so: if we have any strings, we fudge the size parameter so that
+ // SetBestSize() is not called by MSWCreateControl() but then we do call it
+ // manually below
+ bool autoSize = false;
+ wxSize size = sizeOrig;
+ if ( n )
+ {
+ if ( size.x < 0 )
+ {
+ size.x = 1;
+ autoSize = true;
+ }
+ if ( size.y < 0 )
+ {
+ size.y = 1;
+ autoSize = true;
+ }
+ }
+
+ // initialize wxControl
+ if ( !CreateControl(parent, id, pos, size, style, validator, name) )
return FALSE;
- // A choice/combobox normally has a white background (or other, depending
- // on global settings) rather than inheriting the parent's background colour.
+ // now create the real HWND
+ if ( !MSWCreateControl(wxT("COMBOBOX"), _T(""), pos, size) )
+ return FALSE;
+
+
+ // choice/combobox normally has "white" (depends on colour scheme, of
+ // course) background rather than inheriting the parent's background
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+ // initialize the controls contents
for ( int i = 0; i < n; i++ )
{
Append(choices[i]);
}
- SetSize(pos.x, pos.y, size.x, size.y);
+ // and now we may finally size the control properly (if needed)
+ if ( autoSize )
+ {
+ SetBestSize(sizeOrig);
+ }
return TRUE;
}
+bool wxChoice::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ const wxArrayString& choices,
+ long style,
+ const wxValidator& validator,
+ const wxString& name)
+{
+ wxCArrayString chs(choices);
+ return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+ style, validator, name);
+}
+
+WXDWORD wxChoice::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+ // we never have an external border
+ WXDWORD msStyle = wxControl::MSWGetStyle
+ (
+ (style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
+ );
+
+ // WS_CLIPSIBLINGS is useful with wxChoice and doesn't seem to result in
+ // any problems
+ msStyle |= WS_CLIPSIBLINGS;
+
+ // wxChoice-specific styles
+ msStyle |= CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL;
+ if ( style & wxCB_SORT )
+ msStyle |= CBS_SORT;
+
+ return msStyle;
+}
+
wxChoice::~wxChoice()
{
Free();
int wxChoice::DoAppend(const wxString& item)
{
- int n = (int)SendMessage(GetHwnd(), CB_ADDSTRING, 0, (LONG)item.c_str());
+ int n = (int)SendMessage(GetHwnd(), CB_ADDSTRING, 0, (LPARAM)item.c_str());
if ( n == CB_ERR )
{
wxLogLastError(wxT("SendMessage(CB_ADDSTRING)"));
}
+ else // ok
+ {
+ // we need to refresh our size in order to have enough space for the
+ // newly added items
+ UpdateVisibleHeight();
+ }
return n;
}
wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
- int n = (int)SendMessage(GetHwnd(), CB_INSERTSTRING, pos, (LONG)item.c_str());
+ int n = (int)SendMessage(GetHwnd(), CB_INSERTSTRING, pos, (LPARAM)item.c_str());
if ( n == CB_ERR )
{
wxLogLastError(wxT("SendMessage(CB_INSERTSTRING)"));
}
+ else // ok
+ {
+ UpdateVisibleHeight();
+ }
return n;
}
}
SendMessage(GetHwnd(), CB_DELETESTRING, n, 0);
+
+ UpdateVisibleHeight();
}
void wxChoice::Clear()
Free();
SendMessage(GetHwnd(), CB_RESETCONTENT, 0, 0);
+
+ UpdateVisibleHeight();
}
void wxChoice::Free()
// wxMSW specific helpers
// ----------------------------------------------------------------------------
+void wxChoice::UpdateVisibleHeight()
+{
+ // be careful to not change the width here
+ DoSetSize(-1, -1, -1, GetSize().y, wxSIZE_USE_EXISTING);
+}
+
void wxChoice::DoMoveWindow(int x, int y, int width, int height)
{
// here is why this is necessary: if the width is negative, the combobox
wxControl::DoMoveWindow(x, y, width, height);
}
+void wxChoice::DoGetSize(int *w, int *h) const
+{
+ // this is weird: sometimes, the height returned by Windows is clearly the
+ // total height of the control including the drop down list -- but only
+ // sometimes, and normally it isn't... I have no idea about what to do with
+ // this
+ wxControl::DoGetSize(w, h);
+}
+
void wxChoice::DoSetSize(int x, int y,
- int width, int WXUNUSED(height),
+ int width, int height,
int sizeFlags)
{
- // Ignore height parameter because height doesn't mean 'initially
- // displayed' height, it refers to the drop-down menu as well. The
- // wxWindows interpretation is different; also, getting the size returns
- // the _displayed_ size (NOT the drop down menu size) so
- // setting-getting-setting size would not work.
+ int heightOrig = height;
- wxControl::DoSetSize(x, y, width, -1, sizeFlags);
+ // the height which we must pass to Windows should be the total height of
+ // the control including the drop down list while the height given to us
+ // is, of course, just the height of the permanently visible part of it
+ if ( height != -1 )
+ {
+ // don't make the drop down list too tall, arbitrarily limit it to 40
+ // items max and also don't leave it empty
+ size_t nItems = GetCount();
+ if ( !nItems )
+ nItems = 9;
+ else if ( nItems > 39 )
+ nItems = 39;
+
+ // add space for the drop down list
+ const int hItem = SendMessage(GetHwnd(), CB_GETITEMHEIGHT, 0, 0);
+ height += hItem*(nItems + 1);
+ }
+
+ wxControl::DoSetSize(x, y, width, height, sizeFlags);
+
+ // if the height specified for the visible part of the control is
+ // different from the current one, we need to change it separately
+ // as it is not affected by normal WM_SETSIZE
+ if ( height != -1 )
+ {
+ const int delta = heightOrig - GetSize().y;
+ if ( delta )
+ {
+ int h = ::SendMessage(GetHwnd(), CB_GETITEMHEIGHT, (WPARAM)-1, 0);
+ SendMessage(GetHwnd(), CB_SETITEMHEIGHT, (WPARAM)-1, h + delta);
+ }
+ }
}
wxSize wxChoice::DoGetBestSize() const
{
// find the widest string
- int wLine;
int wChoice = 0;
- int nItems = GetCount();
- for ( int i = 0; i < nItems; i++ )
+ const size_t nItems = GetCount();
+ for ( size_t i = 0; i < nItems; i++ )
{
- wxString str(GetString(i));
- GetTextExtent(str, &wLine, NULL);
+ int wLine;
+ GetTextExtent(GetString(i), &wLine, NULL);
if ( wLine > wChoice )
wChoice = wLine;
}
if ( wChoice == 0 )
wChoice = 100;
- // the combobox should be larger than the widest string
- int cx, cy;
- wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
-
- wChoice += 5*cx;
-
- // Choice drop-down list depends on number of items (limited to 10)
- size_t nStrings = nItems == 0 ? 10 : wxMin(10, nItems) + 1;
- int hChoice = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*nStrings;
+ // the combobox should be slightly larger than the widest string
+ wChoice += 5*GetCharWidth();
- return wxSize(wChoice, hChoice);
+ return wxSize(wChoice, EDIT_HEIGHT_FROM_CHAR_HEIGHT(GetCharHeight()));
}
-long wxChoice::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT wxChoice::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{
if ( nMsg == WM_LBUTTONUP )
{
projects / wxWidgets.git / blobdiff