X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/066f1b7a9580fc6c487efa753d61e3683de61407..9f7948af90ec2e3b907944e7d979f0863910c5c8:/src/msw/choice.cpp diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp index 57631408b6..8e72b07078 100644 --- a/src/msw/choice.cpp +++ b/src/msw/choice.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "choice.h" #endif @@ -40,8 +40,57 @@ #include "wx/msw/private.h" +#if wxUSE_EXTENDED_RTTI +WX_DEFINE_FLAGS( wxChoiceStyle ) + +wxBEGIN_FLAGS( wxChoiceStyle ) + // 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) + +wxEND_FLAGS( wxChoiceStyle ) + +IMPLEMENT_DYNAMIC_CLASS_XTI(wxChoice, wxControl,"wx/choice.h") + +wxBEGIN_PROPERTIES_TABLE(wxChoice) + wxEVENT_PROPERTY( Select , wxEVT_COMMAND_CHOICE_SELECTED , wxCommandEvent ) + + 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( Selection ,int, SetSelection, GetSelection, , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY_FLAGS( WindowStyle , wxChoiceStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style +wxEND_PROPERTIES_TABLE() + +wxBEGIN_HANDLERS_TABLE(wxChoice) +wxEND_HANDLERS_TABLE() + +wxCONSTRUCTOR_4( wxChoice , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size ) +#else IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) - +#endif /* TODO PROPERTIES selection (long) @@ -66,17 +115,6 @@ bool wxChoice::Create(wxWindow *parent, 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) && @@ -85,23 +123,74 @@ bool wxChoice::Create(wxWindow *parent, _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& size, + int n, const wxString choices[], + long style, + const wxValidator& validator, + const wxString& name) +{ + // initialize wxControl + if ( !CreateControl(parent, id, pos, size, style, validator, name) ) + return FALSE; + + // now create the real HWND + if ( !MSWCreateControl(wxT("COMBOBOX"), _T(""), pos, size) ) return FALSE; - // A choice/combobox normally has a white background (or other, depending - // on global settings) rather than inheriting the parent's background colour. + + // 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 for ( int i = 0; i < n; i++ ) { Append(choices[i]); } - SetSize(pos.x, pos.y, size.x, size.y); - 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(); @@ -118,6 +207,12 @@ int wxChoice::DoAppend(const wxString& item) { 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; } @@ -132,6 +227,10 @@ int wxChoice::DoInsert(const wxString& item, int pos) { wxLogLastError(wxT("SendMessage(CB_INSERTSTRING)")); } + else // ok + { + UpdateVisibleHeight(); + } return n; } @@ -146,6 +245,8 @@ void wxChoice::Delete(int n) } SendMessage(GetHwnd(), CB_DELETESTRING, n, 0); + + UpdateVisibleHeight(); } void wxChoice::Clear() @@ -153,6 +254,8 @@ void wxChoice::Clear() Free(); SendMessage(GetHwnd(), CB_RESETCONTENT, 0, 0); + + UpdateVisibleHeight(); } void wxChoice::Free() @@ -304,6 +407,17 @@ wxClientData* wxChoice::DoGetItemClientObject( int n ) const // wxMSW specific helpers // ---------------------------------------------------------------------------- +int wxChoice::GetVisibleHeight() const +{ + return ::SendMessage(GetHwnd(), CB_GETITEMHEIGHT, (WPARAM)-1, 0); +} + +void wxChoice::UpdateVisibleHeight() +{ + // be careful to not change the width here + DoSetSize(-1, -1, -1, GetVisibleHeight(), 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 @@ -322,29 +436,65 @@ void wxChoice::DoMoveWindow(int x, int y, int width, int height) wxControl::DoMoveWindow(x, y, width, height); } +void wxChoice::DoGetSize(int *w, int *h) const +{ + wxControl::DoGetSize(w, h); + + // we need to return only the height of the visible part, not the entire + // height in the Windows sense which includes the height of the drop down + // list as well + if ( h ) + *h = GetVisibleHeight(); +} + 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; + + // 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, -1, sizeFlags); + 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 hVisibleCurrent = GetVisibleHeight(); + if ( hVisibleCurrent != heightOrig ) + { + SendMessage(GetHwnd(), CB_SETITEMHEIGHT, (WPARAM)-1, heightOrig); + } + } } 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; } @@ -354,17 +504,10 @@ wxSize wxChoice::DoGetBestSize() const 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, GetVisibleHeight()); } long wxChoice::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)