Commit Graph

49 Commits

Author SHA1 Message Date
Artur Wieczorek
2072bfa00e Fixed rescaling wxBitmap.
Create rescaled wxBitmap with the same colour depth as the source bitmap.
2016-02-26 21:22:18 +01:00
Artur Wieczorek
08f800ab16 Fix wxSearchCtrl (generic) compilation when wxUSE_IMAGE==0
Implemented function to rescale a bitmap even if rescaling using wxImage is not possible.
2016-02-25 23:48:56 +01:00
Tobias Taschner
8282c1be0f Remove Windows CE support
Windows CE doesn't seem to be supported by Microsoft any longer. Last CE
release was in early 2013 and the PocketPC and Smartphone targets supported by
wxWidgets are long gone.

The build files where already removed in an earlier cleanup this commit
removes all files, every #ifdef and all documentation regarding the Windows CE
support.

Closes https://github.com/wxWidgets/wxWidgets/pull/81
2015-09-23 00:52:30 +02:00
Paul Cornett
27a8d28029 more use of wxOVERRIDE 2015-09-06 17:20:42 -07:00
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
Julian Smart
550b039d6c Improved search text control height and position on Windows.
Was previously much too tall (regression from 3.0).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-24 12:52:54 +00:00
Vadim Zeitlin
a307120d50 Fix generic wxSearchCtrl size/layout code.
Override DoGetBestClientSize() instead of DoGetBestSize(), as we're really
computing just the size of our contents and like this we don't need to hard
code platform-dependent border sizes in this control itself.

Also use the client size in LayoutControls() for the same reason. This also
makes it unnecessary to pass it the width and height as it can find them on
its own. And x and y were never used in the first place, so remove them too.

Finally, center the bitmaps vertically.

Closes #16422.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-18 21:32:55 +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
ce7fe42e84 Provide shorter synonyms for wxEVT_XXX constants.
Use the same short names as are used by the event table macros for the event
type constants themselves. This makes them much more comfortable to use, e.g.
Bind(wxEVT_BUTTON) compared to Bind(wxEVT_COMMAND_BUTTON_CLICKED).

The old long names are still kept for backwards compatibility and shouldn't be
removed as it doesn't really cost anything to continue providing them, but all
new event types should only use the short versions.

Closes #10661.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-25 10:11:03 +00:00
Vadim Zeitlin
09ca8913fa Fix wxSearchCtrl::HasFocus() in the generic version.
Override GetMainWindowOfCompositeControl() in the windows composing the
generic wxSearchCtrl to ensure that HasFocus() correctly returns true for the
entire control when any of them has focus.

Add a trivial unit test to check that this really works and facilitate adding
more tests for this class later.

Closes #14970.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-20 02:09:44 +00:00
Vadim Zeitlin
639dbb6dd6 Restore propagation of EVT_SEARCHCTRL_CANCEL_BTN events to the parent.
This was broken by r72581, add event.Skip() call to the handler for this event
added there.

Also add a handler for this event to the corresponding page of the widgets
sample to be able to test this.

Closes #14799.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-11-06 23:56:21 +00:00
Vadim Zeitlin
5d83eee7dd Fix computation of menu button best size in generic wxSearchCtrl.
Invalidate the cached best size when the bitmap changes.

Closes #14708.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-30 20:35:33 +00:00
Vadim Zeitlin
e5eff43833 Clear the search control automatically when it's "Cancel" button is pressed.
This should be the desired behaviour in the vast majority of cases, so do it
by default.

Replace the useless OnSearchButton() doing nothing with search button events
with OnCancelButton() handling cancel button events and clearing the control.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-30 20:35:10 +00:00
Vadim Zeitlin
274e4265a8 Don't use text control foreground colour for generic wxSearchCtrl itself.
Logically, it should be done in the other direction and also doing it like
this means that the search and cancel icons, rendered using the current
foreground colour, are barely visible when using generic wxTextCtrl::SetHint()
implementation, as in wxGTK, because the text control foreground is set to
light grey in this case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-30 20:34:46 +00:00
Vadim Zeitlin
241708ca47 Fix generic wxSearchCtrl best size calculation.
The best size of its text control part was not calculated correctly any more
because a wrong best size was cached during wxSearchTextCtrl construction,
when the final class overridden DoGetBestSize() was not called.

Fix this by explicitly invalidating the best size at the end of constructor
for now even though it would be arguably better to fix this in some way not
requiring anything extra to be done to always take the overridden method into
account, especially as it used to work before. But it's not clear how exactly
to restore this so for now do at least fix wxSearchCtrl appearance.

Closes #14708.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-28 23:50:27 +00:00
Vadim Zeitlin
a166dbbab5 Restore correct wxSearchCtrl size in wxMSW after wxTextCtrl changes.
The code in generic wxSearchCtrl implementation was broken by the changes of
r69066 which deccreased the best height of border-less text controls.

Ideally we should probably change wxSearchCtrl::LayoutControls() to not be
sensitive at all to the exact value returned from wxTextCtrl::GetBestSize()
and just always centre everything vertically but this doesn't look simple to
do with the current code so just override wxSearchTextCtrl::DoGetBestSize() to
return the same size as wxTextCtrl used to return before to fix this for now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-02 11:28:40 +00:00
Vadim Zeitlin
35368572bc Set colours and fonts for all elements of the generic wxSearchCtrl.
Derive generic wxSearchCtrl from wxCompositeWindow<> to ensure that calls to
its Set{Fore,Back}groundColour() are propagated to all its children, otherwise
they applied only to the composite control itself but not e.g. its text part.

Also update the bitmaps when the background colour changes to ensure that it
appears as transparent.

Closes #13428.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 12:13:23 +00:00
Vadim Zeitlin
7e0a200b08 Don't give focus to wxSearchButton when using keyboard navigation.
The search control buttons don't show that they have focus and are not meant
to have it anyhow as they are more control decorations than real buttons and
their functionality can be activated by pressing "Enter" or "Escape" already
from the keyboard. But giving it to them made TAB behave unexpectedly and
wrongly when wxSearchCtrl had focus.

Override AcceptsFocusFromKeyboard() to return false to correct this.

See #12808.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-24 22:19:27 +00:00
Vadim Zeitlin
7ecc7eb6be Use native hint wxTextCtrl support in wxSearchCtrl.
Instead of using broken emulation of the support for hints available in the
text control, use the real wxTextCtrl::SetHint() for SetDescriptiveText()
implementation in the search control.

This looks better and, more importantly, fixes the bug when searching for the
string equal to the current descriptive text searched for an empty string
instead.

Closes #13324.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-12 09:13:43 +00:00
Dimitri Schoolwerth
a1b806b982 Replaced Ok() occurrences with IsOk() throughout trunk.
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk().

Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 16:29:04 +00:00
Vadim Zeitlin
c892ae145c No changes, just clean up duplicate colour functions in wxSearchCtrl.
Use wxColor::ChangeLightness() instead of private wxStepColour() that
duplicates it.

Close #12744.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-03 12:40:08 +00:00
Vadim Zeitlin
526954c596 Globally use "wxWindows licence" consistently.
Use "wxWindows licence" and not "wxWidgets licence" (the latter doesn't
exist) and consistently spell "licence" using British spelling.

See #12165.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-13 13:29:13 +00:00
Vadim Zeitlin
ac63bc407e Set the string to search for in wxSearchCtrl events.
It's more convenient to have the string to search for directly in the event
object than to retrieve it from wxSearchCtrl itself as it had to be done
before.

Closes #4665.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-11 10:44:18 +00:00
Vadim Zeitlin
135b23b266 added wxTextEntry::DoGetValue() to allow returning empty string if the control currently contains hint text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-02 13:31:29 +00:00
Stefan Csomor
0b6a49c21f forward define for non precomp build, switching preproc constants for consistency
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-05 19:02:51 +00:00
Paul Cornett
d3ad397447 avoid setting a negative window size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-23 17:43:09 +00:00
Vadim Zeitlin
bdb7278a27 fixed totally wrong change in r49070
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-07 10:45:34 +00:00
Vadim Zeitlin
8366ab05cd don't use using directive, Watcom seems to have problems with it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-06 22:10:45 +00:00
Vadim Zeitlin
0ec1179b86 added wxTextEntry common base class for both wxTextCtrl and wxComboBox; refactor wxGTK code to put common parts of these classes in the base class; fixed some inconsistencies in the text control behaviour between platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-26 00:30:22 +00:00
Vadim Zeitlin
74ab5f5b9d various warning fixes for icc 9.1 compilation
- variable shadowing
- unused code and variables
- extra semicolons


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-21 12:00:25 +00:00
Robin Dunn
e6d0599dc7 tweak the size and layout of the cancel button a bit so it doesn't get clipped.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-07 21:44:02 +00:00
Julian Smart
a047aff270 Added wxBORDER_THEME, wxWindow::GetDefaultBorderForControl(), wxWindow::CanApplyThemeBorder().
wxTextCtrl and wxSearchCtrl now get the correct border on wxMSW, and the wxRichTextCtrl sample
also now demonstrates correct borders.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-07 19:22:43 +00:00
Vadim Zeitlin
cfddeb1067 fix compilation in wxUSE_MENUS==0 case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-05 14:48:20 +00:00
Vadim Zeitlin
88c23b64c7 fix assert because of passing more than one border bit in style to the base class Create()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-18 23:07:58 +00:00
Robin Dunn
b5dc8fdbfd use ChangeValue instead of SetValue to avoid bogus EVT_TEXT events
when just setting the descriptive text.
(ported from 2.8 branch)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-06 21:14:42 +00:00
Robin Dunn
4aab34290a Return an empty string from GetValue if the textctrl is set to the
descriptive text


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-21 06:47:33 +00:00
Robin Dunn
6646ca90e8 Added wxSearchCtrl::[Get|Set]DescriptiveText
Tweaked the layout of the subcontrols a bit
Lightened the icons to be more like Mac


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-19 05:27:16 +00:00
Vadim Zeitlin
8ebf24655c unused parameter warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-20 13:45:08 +00:00
Robert Roebling
10eeb875ec Made wxSearchCtrl look like other text controls under GTK+.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-12 22:27:01 +00:00
Robin Dunn
af1f44f17e Also do LayoutControls from EVT_SIZE handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-12 00:53:52 +00:00
Robin Dunn
9b4c231467 Fix compile error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 21:12:32 +00:00
Kevin Ollivier
c60122bf37 Change event names to clarify that they are only fired by button clicks, and note ways of retrieving search queries in the docs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 20:32:16 +00:00
Paul Cornett
09d93215cf cleanup:
wrap everything in #if wxUSE_SEARCHCTRL,
    implementation include comes first,
    parenthesize macro replacement containing operators,
    unused variable,
    use of pointer after delete,
    bizarre boolean expression


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 18:33:58 +00:00
Vadim Zeitlin
8bc333d76d added $Id$ to the header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 14:14:07 +00:00
Vadim Zeitlin
5b43c75c1d added wx prefix to wxUSE_NATIVE_SEARCH_CONTROL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 14:08:17 +00:00
Vadim Zeitlin
ec184e3242 1. Renamed Set/GetXXXVisible() to ShowXXX() and IsXXXVisible()
2. Moved wxSearchCtrlBase to wx/srchctrl.h to avoid duplicating it
3. Removed gcc #pragmas


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 13:48:18 +00:00
Chris Elliott
6f011faaf0 fix watcom problem (thanks ABX)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 09:43:39 +00:00
Chris Elliott
38f74dffc1 fix missing includessrc/generic/srchctlg.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 09:30:26 +00:00
Robin Dunn
3f7f284d55 Modified form of Patch #1611222, adds wxSearchCtrl (generic & native carbon HISearchField)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-11 06:19:27 +00:00