Commit Graph

137 Commits

Author SHA1 Message Date
Vadim Zeitlin
cd57c6d690 Don't explicitly set the background colour for wxChoice.
This is unnecessary and results in flicker when the control is resized because
we explicitly erase its background ourselves and then it does it itself.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-18 20:49:29 +00:00
Vadim Zeitlin
7fc1b0c7ca Fix harmless warning about -1 to WPARAM conversion.
This was introduced by the last change to this file in r62058.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-26 16:42:56 +00:00
Julian Smart
da89830af4 Applied #10025 (Patch to allow proper sizing of simple combo box)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-24 09:07:13 +00:00
Vadim Zeitlin
9a83f86094 Globally replace _T() with wxT().
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-23 20:30:22 +00:00
Vadim Zeitlin
5d4ee50b0a corrections to setting the height of the visible part of wxChoice after recent changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-08 19:45:31 +00:00
Vadim Zeitlin
75004dfbe5 implement changing wxChoice and wxComboBox height
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-01 21:49:43 +00:00
Vadim Zeitlin
cbeda384e5 no changes, just remove #if'd out code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-01 12:50:25 +00:00
Vadim Zeitlin
13139e9300 restore the original selection when the dropdown is cancelled even if it was -1; this fixes the problem of #9995 and the existing code didn't deal correctly with the problem of losing current text in the combobox when the dropdown was cancelled anyhow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-24 13:33:06 +00:00
Vadim Zeitlin
5de69dd366 don't lose the contents of the combobox if it was set to a value not in a list and a popup has been opened and closed (patch 1883474)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-09 15:22:15 +00:00
Vadim Zeitlin
b4a11fe85c don't access m_clientDataItemsType directly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-17 00:12:13 +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
f785bfddbd don't lose the combobox text when it's opened and closed (patch 1684252, closes bug 1612994)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-22 02:43:52 +00:00
Václav Slavík
c9f7896861 first phase of transition to unified Unicode build:
1. changed c_str() to return wxCStrData (implicitly convertible to wxChar*)
2. added template type-safe wrappers for vararg functions
3. added wxUniChar class representing single Unicode character
4. changed wxString::operator[] and wxString::iterator to return wxUniChar


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-17 10:26:10 +00:00
Vadim Zeitlin
f4322df68b no changes, just removed TABs/trailing spaces
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-07 22:56:34 +00:00
Vadim Zeitlin
0ad2a19e42 corrected IMPLEMENT_DYNAMIC_CLASS macros to ensure that the controls are seen to derive from wxControlWithItems by the wx RTTI code (patch 1659708)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-14 16:10:08 +00:00
Robin Dunn
170acdc90e GetBestFittingSize --> GetEffectiveMinSize
SetBestFittingSize --> SetInitialSize
SetBestSize  --> SetInitialSize
SetInitialBestSize --> SetInitialSize


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-31 08:50:17 +00:00
Julian Smart
36043052e8 Compile fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-14 16:31:40 +00:00
Julian Smart
5637cc3551 Fix for wrong combobox/height being reported if set size is pending
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-14 13:11:53 +00:00
Włodzimierz Skiba
b36e08d086 Include wx/choice.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-30 07:34:30 +00:00
Vadim Zeitlin
593ac33e50 added InitCommandEventWithItems() and call it from wxChoice and wxComboBox code to ensure that per item client data is set correctly in the generated events (replaces patch 1476171; closes bug 1470505)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-06 15:48:27 +00:00
Julian Smart
d4445d24d3 Reverted wxChoice size fix due to problems in W2K and below
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-30 09:21:11 +00:00
Vadim Zeitlin
aa61d35253 replaced all int/size_t indices in wxControlWithItems API with unsigned int (committing on behalf of ABX)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 22:05:23 +00:00
Vadim Zeitlin
f2fb22f9b9 fixed last commit which accidentally included parts of upcoming size_t/unsigned patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 17:45:00 +00:00
Vadim Zeitlin
e3e78de1b8 Minor fixes after last commit:
1. don't pass -1 to base class DoSetSize(), this is documented to not work
   under Win2k
2. instead, don't do anything at all if neither size nor position changed
3. only call DoGetSize() once instead of doing it in both if branches
4. added comment about 30000 returned by CB_GETDROPPEDCONTROLRECT


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 16:56:19 +00:00
Julian Smart
0b652e0ef9 Added an optimization that fixes a recursive paint problem when controls
are embedded in wxHTML (or other circumstances where the parent resizes
the choice/combobox within a paint handler). This also speeds up
addition of strings considerably (see "Add many strings" in widgets sample).

Also added a check for silly values that can be returned from
CB_GETDROPPEDCONTROLRECT.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 15:28:02 +00:00
Włodzimierz Skiba
8228b8932a Line-up interfaces to use size_t for GetCount()s (and count related api).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 19:44:45 +00:00
Vadim Zeitlin
c11f04122f fixed event generation for wxChoice: it now sends one and exactly one wxEVT_COMMAND_CHOICE_SELECTED irrespectively of how the item was chosen and only does it after the dropdown is closed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 20:20:16 +00:00
Vadim Zeitlin
d77d8c0719 don't send EVT_CHOICE events while the dropdown is opened for consistency with the other platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 19:43:27 +00:00
Włodzimierz Skiba
11e62fe658 wxItemContainerImmutable::FindString unified.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-27 17:05:26 +00:00
Mart Raudsepp
8907154c1a Nuke #pragma implementation/interface's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 12:56:45 +00:00
Dimitri Schoolwerth
94500b3284 reverted last changes which were false alarm
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-14 12:08:24 +00:00
Dimitri Schoolwerth
451f6363c9 fixed uninitialized variable (depending on wxChoice ctor used it resulted in an out of bounds wxChoice::GetSelection() return value)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-13 12:54:59 +00:00
Vadim Zeitlin
6ba93d23bf made wxChoice and wxComboBox::GetSelection() return only completed selection in wxMSW; added GetCurrentSelection() with the old behaviour and documented it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-17 13:30:33 +00:00
Robin Dunn
31582e4e11 Patch #1203934: enable best size caching for MSW widgets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-18 02:23:01 +00:00
Robin Dunn
1d13cc5da4 Cache best size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-17 19:05:03 +00:00
Vadim Zeitlin
2bae4332e7 extended wxWindow::MSWGetBgBrush() and wxControl::MSWControlColor() to work for arbitrary HWNDs and not just wxWindows: this allows us to draw proper background for slider labels and other subcontrols
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-10 21:55:12 +00:00
Vadim Zeitlin
c3732409ac simplifications and corrections to background drawing:
1. removed ApplyParentThemeBackground() not used any longer
2. removed ProvidesBackground() which is synonymous with
   !HasTransparentBackground()
3. removed a whole bunch of unused MSWXXX() methods
4. moved MSWControlColor() from wxWindow up to wxControl

results:

1. the gradient is still shown properly for static/radio boxes in notebooks
2. correct background colour is used for the static boxes
3. code is shorter and better commented


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-10 15:23:08 +00:00
Włodzimierz Skiba
beedefb940 Use empty check consistent with other parts.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-11 07:35:51 +00:00
Włodzimierz Skiba
f31a409829 .empty() string decorations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-09 14:19:49 +00:00
Dimitri Schoolwerth
d6959d6f9e applied patch #1044865 (fixes problem: "On Win2K, the month combobox's dropdown height in the wxCalendar is only about 1 pixel")
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-24 14:30:51 +00:00
Vadim Zeitlin
51cdee11e0 moved code working around combobox selection bug to wxComboBox: wxChoice doesn't have selection anyhow, why should it be there?
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-21 14:39:29 +00:00
Julian Smart
55e0d33c97 Fixed spurious selection of combobox text during resize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-08 17:51:48 +00:00
Vadim Zeitlin
48fa6bd38a replaced OnCtlColor(7 params) with MSWControlColor(1 param)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 19:40:31 +00:00
Vadim Zeitlin
9f368d0d59 removed (unused) nCtlColor parameter of OnCtlColor()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 19:04:09 +00:00
Ryan Norton
4cd1ed991c fix for [ 950550 ] wxChoice - wxEmptyString (wxChoice::FindString doesn't work with empty strings) - confirmed on win2k
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 00:09:39 +00:00
Włodzimierz Skiba
3180bc0e63 Hardware defines spec.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 18:17:07 +00:00
Vadim Zeitlin
f499e61407 make background colour apply to choice/combobox dropdown listbox as well as the main part (patch 1023669)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-10 20:36:50 +00:00
Włodzimierz Skiba
1550d5f80d Native SmartPhone wxChoice implementation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-23 10:53:57 +00:00
Włodzimierz Skiba
02b7b6b072 Source cleaning: whitespaces, -1/wxDefaultCoord, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-20 12:03:08 +00:00
Vadim Zeitlin
e0e3a32dac fixed Freeze/Thaw() for wxCombobox (patch 925808)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-25 12:30:25 +00:00