Commit Graph

35 Commits

Author SHA1 Message Date
Dimitri Schoolwerth
8f8d58d193 Use wx-prefixed macros throughout the repository.
Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE
occurrences to use the wx-prefixed version of the macros.
2015-04-23 22:00:35 +04:00
Vadim Zeitlin
1f6fae0f3f Define unambiguous Is{List,Text}Empty() in wxOwnerDrawnComboBox.
Like in wxComboBox itself, it's useful to provide these methods to avoid
problems with ambiguous IsEmpty(), inherited from both wxTextEntry and
wxItemContainer.

Closes #16618.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-13 12:08:10 +00:00
Paul Cornett
8b4ae731d3 use wxOVERRIDE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-30 00:02:23 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Vadim Zeitlin
e2ac737fba Implement wxComboCtrl::GetSizeFromTextSize().
Improve calculation of wxComboCtrl best size which doesn't work correctly for
non-default fonts as shown by r72935. It is still not perfect but better now.

Closes #14825.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-11-14 13:48:23 +00:00
Vadim Zeitlin
bf8f10225c Get rid of ugly wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST macro.
Replace it with wxWindowWithItems<> template class which takes care of
disambiguating between the two inherited Get/SetClientXXX() versions and use
it as a base class in all clases that previously used the macro.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-30 11:30:08 +00:00
Jaakko Salli
9a7f467140 Removed non-implemented function prototype OnMouseWheel() from wxVListBoxComboPopup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-20 14:54:04 +00:00
Jaakko Salli
238b33ab0e Added wxComboPopup::FindItem() to help in deciding how SetValue() should change the value of a read-only wxComboCtrl. This allows wxOwnerDrawnComboBox to have the same behavior as wxComboBox in that respect.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-20 13:51:24 +00:00
Jaakko Salli
94daedc804 Add enough default arguments to one wxOwnerDrawnComboBox ctor so it can be consructed using only two arguments, same as the wxComboBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-17 11:50:54 +00:00
Jaakko Salli
eae20c901b Resolve ambiguity with wxOwnerDrawnComboBox::Clear(), virtual method which is derived from two base classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-16 18:13:43 +00:00
Jaakko Salli
9ff4b6ccd9 Override wxTextEntry::GetSelection(long *from, long *to) in wxOwnerDrawnComboBox to resolve virtual method hiding issues
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-16 18:07:05 +00:00
Jaakko Salli
c0c05e79b2 Supress SetFocus() warning in wxVListBoxComboPopup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-09 10:29:48 +00:00
Václav Slavík
c765e6fb9d Fix text input and completion in wxComboCtrl and wxOwnerDrawnComboBox.
Both wxEVT_KEY_DOWN and wxEVT_CHAR must be handled and only the latter
used for completion (or any characters input). Don't make incorrect
assumptions about wxEVT_CHAR keycodes either, it's only the Unicode
character and printability that matter.

Otherwise, completion in readonly controls wouldn't work correctly
for e.g. numbers on numpad or non-ASCII characters.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-05 17:19:04 +00:00
Paul Cornett
470f357fd2 make access for virtuals match base
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-16 18:20:21 +00:00
Francesco Montorsi
3fedffdc05 give a name to the enumeration of the values which can be passed to OnDrawItem to make it easier to document it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-06 15:35:21 +00:00
Vadim Zeitlin
fdb47e62b9 decouple item index from string value (patch 1905702)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-02 14:55:43 +00:00
Vadim Zeitlin
a236aa2058 many wxItemContainer-related changes:
1. the main function for item insertion is now DoInsertItems() which allows
   for much more efficient addition of many new items at once
2. the items client data management is done entirely in wxItemContainer
   itself, the derived classes don't have to distinguish between void and
   object client data
3. many fixes for sorted controls, in particular implemented wxCB_SORT support
   in wxGTK combobox


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-26 13:54:14 +00:00
Vadim Zeitlin
e02c72fa45 fix new wxHVScroll code to build with WXWIN_COMPATIBILITY_2_8==0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-08 13:55:36 +00:00
Robert Roebling
ce22ac4592 1552971 ] Add flag for wxODComboBox::OnDrawItem to indicate selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-19 17:16:50 +00:00
Włodzimierz Skiba
f0fa8b47ab PCH and wxUSE_* fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-14 19:03:10 +00:00
Alex Bligh
dc8a1aa53d Apply patch 1520776, partial completion on wxOwnerDrawnComboBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-13 22:06:32 +00:00
Alex Bligh
d9e0958c7e Added GetWidestItem() and GetWidestItemWidth() to wxVListBoxComboPopup
and wxOwnerDrawnComboBox as per Jaakko Salli


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-06 17:42:39 +00:00
Vadim Zeitlin
5769347356 remove duplicate m_popupInterface (patch 1509424)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-27 14:04:27 +00:00
Włodzimierz Skiba
e5d6334238 [ 1507736 ] wxOwnerDrawnComboBox improved list item width checking.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-19 09:02:10 +00:00
Włodzimierz Skiba
db53c6ea2e [ 1506733 ] wxOwnerDrawnComboBox::SetPopupControl argument type check.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-15 21:10:58 +00:00
Włodzimierz Skiba
40b26d752d [ 1492053 ] Add wxVListBox style callbacks to wxOwnerDrawnComboBox.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-14 18:38:47 +00:00
Włodzimierz Skiba
9e6aca686c Keep FindString in sync with wxControlWithItems base class.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-29 13:11:40 +00:00
Włodzimierz Skiba
1c4743aa20 [ 1493780 ] wxOwnerDrawnComboBox warnings fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-24 09:44:56 +00:00
Włodzimierz Skiba
7ca4ac6383 [ 1493802 ] Allow multiple wxComboCtrl::SetPopupControl calls.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-24 09:29:06 +00:00
Vadim Zeitlin
a57d600f1a renamed wxComboControl to wxComboCtrl and related wxUSE_XXX and configure switches for consistency with the other ones
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-16 22:57:40 +00:00
Vadim Zeitlin
c0f482800a fix OpenWatcom warning (patch from Jaakko Salli)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-12 20:04:28 +00:00
Vadim Zeitlin
c98e80d98d correct dll declaration (the classes in the header are part of adv library, not core)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-12 19:31:50 +00:00
Paul Cornett
dcc8cf5ae3 correct access for virtuals
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-10 17:08:45 +00:00
Vadim Zeitlin
6d0ce565ff fixes and missing files from the first wxComboControl patch (update of patch 1479938)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-09 16:18:19 +00:00
Vadim Zeitlin
a340b80d8a wxComboControl and wxOwnerDrawnComboBox (patch 1479938)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-08 23:42:45 +00:00