Vadim Zeitlin [Thu, 30 Dec 2010 22:37:10 +0000 (22:37 +0000)]
Compilation fixes for wxUniversal/MSW.
Don't use wxMSW-specific functions when building wxUniversal.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66494
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Thu, 30 Dec 2010 22:37:03 +0000 (22:37 +0000)]
Move wxGetLibraryVersionInfo() to core from base.
This function uses the GUI toolkit information and so can't be defined in
wxBase. The code only compiled before because the function was erroneously
defined in wxCore even though it was declared as WXDLLIMPEXP_BASE.
Fix this by declaring it with WXDLLIMPEXP_CORE too. This corrects problems in
MSW DLL build.
If we need to get a string containing user-readable wxBase version too, we
should add another function (as it's not possible to virtualize this one) but
such function doesn't seem incredibly useful to have anyhow.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66493
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Thu, 30 Dec 2010 22:36:56 +0000 (22:36 +0000)]
Don't crash on malformed HTML in wxHTML font tag handler.
Don't try to access the first character of the size parameter value before we
are sure that it is not empty.
Closes #12812.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66492
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Dimitri Schoolwerth [Wed, 29 Dec 2010 12:31:37 +0000 (12:31 +0000)]
Tightened icon and cursor file detection heuristics.
When loading a TGA file that has an image type of uncompressed true colour it would be falsely detected as a cursor file and as an icon file if type is of uncompressed colour mapped. Lower the chance of this happening by also checking the remaining member of an ICO and CUR header which represents the number of images in the file. This member has to be non-zero (checked against all found ICO and CUR files in an XP installation).
See also #12702.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66491
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Wed, 29 Dec 2010 00:01:48 +0000 (00:01 +0000)]
Update the generated makefile after wxOSX OpenGL changes.
Rebake the makefile after the changes in r66357.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66486
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Dimitri Schoolwerth [Tue, 28 Dec 2010 22:38:04 +0000 (22:38 +0000)]
Added saving support to TGA image handler.
Supports saving 24-bit and 32-bit (RGB with alpha).
Updated image unit test to verify the alpha channel of saved TGA images. Also removed a condition skipping a test which only was in place for TGA (formerly its saving handler would do nothing yet say saving was succesful).
See also #7661.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66485
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Dimitri Schoolwerth [Tue, 28 Dec 2010 22:05:01 +0000 (22:05 +0000)]
Expanded existing image saving test to also verify alpha content of saved images.
Compare the alpha data of saved images (where applicable, currently for PNG only) to a generated alpha channel. Refactored most of ImageTestCase.CompareSavedImage into (static) function CompareImage to easily compare with a 24-bit image and then a 32-bit one.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66483
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Dimitri Schoolwerth [Tue, 28 Dec 2010 19:50:41 +0000 (19:50 +0000)]
Added some simple unit tests for verifying pixel content of loaded and saved images.
Compare the data of loaded images in different formats against a reference image (one for 8-bit images, another for 24-bit). Do the same for images saved using SaveFile. Excluded some formats because they are either lossy or don't pass the test right now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66478
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Tue, 28 Dec 2010 16:44:15 +0000 (16:44 +0000)]
removing obsolete NO_PRAGMA
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66477
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Dimitri Schoolwerth [Tue, 28 Dec 2010 15:57:44 +0000 (15:57 +0000)]
Updated manual regarding image alpha support for BMP, PNG, and TIFF handlers.
For PNG it was mentioned only loading supports alpha, but alpha saving support has been available since r32414. Similarly there was no mention of alpha loading support for TIFF (supported since r47204) as well as BMP (since r54942).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66476
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Robin Dunn [Mon, 27 Dec 2010 20:47:12 +0000 (20:47 +0000)]
Fix various missing or broken stuff needed for Project Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66474
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Mon, 27 Dec 2010 13:16:54 +0000 (13:16 +0000)]
adding backtab to exception list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66459
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Mon, 27 Dec 2010 11:50:34 +0000 (11:50 +0000)]
Removed AdvImageFileProperty from the wxPropertyGrid sample. It was somewhat impractical and bug-prone.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66458
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Mon, 27 Dec 2010 11:25:53 +0000 (11:25 +0000)]
Test wxPropertyGrid::DoubleToString()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66457
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Mon, 27 Dec 2010 11:17:40 +0000 (11:17 +0000)]
No longer use semi-static IDs for wxPropertyGrid embedded controls and tool bar tools.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66456
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Mon, 27 Dec 2010 06:31:14 +0000 (06:31 +0000)]
adding backtab to exception list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66455
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Mon, 27 Dec 2010 06:30:42 +0000 (06:30 +0000)]
make sure we always have a return value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66454
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 26 Dec 2010 16:29:22 +0000 (16:29 +0000)]
Increase wxStaticText height in wxMSW to align its text with wxTextCtrl.
The base lines of the text in wxTextCtrl and wxStaticText which were
themselves vertically aligned didn't align, the text in the latter was one
pixel too low. This seems to be happening because we don't give enough
vertical space to the native static control by default and so, while the text
wasn't truncated, it was positioned differently than usual.
Work around this problem by allocating two extra pixels to wxStaticText
height. While the exact explanation of the problem remains mysterious, this
hack does result in correct appearance which seems to be sufficiently
important to apply it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66452
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sat, 25 Dec 2010 14:19:07 +0000 (14:19 +0000)]
Compilation fix for wxMSW build without PCH.
We need wxApp declaration since the changes of r66425.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66447
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sat, 25 Dec 2010 14:18:58 +0000 (14:18 +0000)]
Test for wcsftime() in configure as it's not available everywhere.
Contrary to the comment in wx/wxcrtbase.h, wcsftime() doesn't seem to be
available under quite all the systems, notably it doesn't seem to be present
in OpenBSD at all, even in the very latest version.
Add a configure test for this function and fall back to our own implementation
if the system doesn't have it.
Closes #12766.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66446
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sat, 25 Dec 2010 14:18:50 +0000 (14:18 +0000)]
Give an error from configure if wchar_t is not available.
wxWidgets 2.9 doesn't support building without wchar_t any more so always
define wxUSE_WCHAR_T and give an error from configure if wchar_t is really not
available.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66445
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sat, 25 Dec 2010 13:46:29 +0000 (13:46 +0000)]
Make the margin between wxSpinCtrlGeneric sub-windows compatible with MSW.
Native MSW wxSpinCtrl uses a single pixel margin between the text part and the
spin button while the generic version used 2 pixels which resulted in a
slightly different appearance (see #12767).
Use the same margin as MSW now in the generic version too, it should be fine
for the other platforms as well and if it isn't we can always tweak them
later.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66444
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sat, 25 Dec 2010 13:46:23 +0000 (13:46 +0000)]
Correct bug in the wxSpinCtrlGeneric sub-controls resizing.
The code in DoMoveWindow() didn't account for the margin and made the text
control part of the window too large resulting in the truncation of the spin
button.
Simply remember to take margin into account when computing the text width.
See #12767.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66443
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sat, 25 Dec 2010 13:19:00 +0000 (13:19 +0000)]
Document wxItemContainer::SetStringSelection() as case-insensitive.
Add unit tests checking that the behaviour really corresponds to the
documentation too.
And also mention that it's not a good idea to have strings differing by case
only in wxComboBox anyhow.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66442
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sat, 25 Dec 2010 13:18:52 +0000 (13:18 +0000)]
Minor improvements to wxComboBox documentation.
Mention that wxCB_DROPDOWN is MSW (and Motif...) specific and don't document
the much more often used wxCB_READONLY in its terms, just describe it directly
instead.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66441
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Thu, 23 Dec 2010 12:48:00 +0000 (12:48 +0000)]
Run tests with "-t" option on OS X too.
OS X build slave used its own commands to run unit tests, add -t to them too
to be (hopefully) able to see better where does the test crash exactly.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66440
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Thu, 23 Dec 2010 12:47:53 +0000 (12:47 +0000)]
Correct Mac OX/iPhone check in libpng.
Correct the syntax of preprocessor check for wxOSX_USE_IPHONE in libpng, it
got somehow broken during upgrade to 1.4.4.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66439
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Thu, 23 Dec 2010 10:26:06 +0000 (10:26 +0000)]
Added dummy GetTextWidget() implementation for wxMotif wxComboCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66438
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Wed, 22 Dec 2010 18:44:42 +0000 (18:44 +0000)]
Added section 'Customizing Keyboard Handling' into wxPropertyGrid overview
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66435
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Wed, 22 Dec 2010 17:43:49 +0000 (17:43 +0000)]
Bring AddActionTrigger() doc string up to date with the interface
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66433
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Wed, 22 Dec 2010 17:25:45 +0000 (17:25 +0000)]
Added wxPG_ACTION_EDIT, which allows specifying custom key to move focus to the property editor. Also documented wxPG_ACTION_FOOs better.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66432
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Wed, 22 Dec 2010 13:57:28 +0000 (13:57 +0000)]
Switch to GtkTooltip from deprecated GtkTooltips in wxGTK wxToolTip.
Don't use deprecated GtkTooltips in wxGTK code any more, use the new
GtkTooltip instead.
Closes #12034.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66431
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Wed, 22 Dec 2010 13:57:21 +0000 (13:57 +0000)]
Really fix recently broken accelerators handling in menu items.
As wxAcceleratorEntry::Create() now expects the full menu item label, just
pass GetItemLabel() to it in wxMenuItemBase::GetAccel() instead of half-
parsing it ourselves there.
Closes #12794.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66430
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Wed, 22 Dec 2010 13:57:15 +0000 (13:57 +0000)]
Implement proper wxCursor cloning in wxDFB.
wxDFB compilation was broken by recent wxObjectRefData copy ctor-related
changes. Fix it by not using wxCursorRefData copy ctor any more, call
wxCursorRefData::Clone() which does the right thing explicitly instead.
Closes #12791.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66429
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Wed, 22 Dec 2010 13:57:08 +0000 (13:57 +0000)]
Use stock ids for menu items in the config sample.
This not only removes some unnecessary code from the sample but also fixes a
problem due to the use of a 0 id under wxOSX (which is unsupported there).
Closes #12788.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66428
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Wed, 22 Dec 2010 13:57:03 +0000 (13:57 +0000)]
Compute print preview scale using real DPI values in wxGTK.
Replace hardcoded 72 DPI which was "compensated" for with a 0.8 fudge factor
with the values using the real screen DPI in wxGTK and PostScript print
preview classes.
Closes #12777.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66427
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Wed, 22 Dec 2010 13:56:56 +0000 (13:56 +0000)]
Correct and extend wxConfig::Create() documentation.
Replace mentions of the non-existent wxCONFIG_WIN32_NATIVE with
wxUSE_CONFIG_NATIVE. Also explain what does the "best implementation" really
mean and link to wxAppTraitsBase::CreateConfig().
Closes #12787.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66426
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Wed, 22 Dec 2010 13:56:49 +0000 (13:56 +0000)]
Use generic wxHyperlinkCtrl under Vista/7 without comtrl32.dll v6.
Replace the test for the OS version with the test for comtrl32.dll version in
HasNativeHyperlinkCtrl() wxMSW function as the native control could be not
available even under Vista/7 if we're not using comtrl32.dll v6 and this can
happen if the program was linked without the appropriate manifest or, possibly
more likely, if a DLL using wxWidgets was loaded by such a program.
Closes #12711.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66425
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Robert Roebling [Tue, 21 Dec 2010 19:38:52 +0000 (19:38 +0000)]
Don't let anything, such as pressing F2, start editing an entry if the renderer is set to wxDATAVIEW_CELL_INERT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66424
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Robert Roebling [Tue, 21 Dec 2010 19:27:35 +0000 (19:27 +0000)]
model column and index of column in the dataview can be different, correct this and also make wxGTK and wxMSW report the same thing in the event following wxDataViewModel::SetValue(), fixes #12755: wxDataViewCtrl bug when the column is mapped to different model column. Also commit some older change reseting the cursor under the mouse.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66423
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Julian Smart [Tue, 21 Dec 2010 11:11:25 +0000 (11:11 +0000)]
Fixed bad rendering with tabs by correcting the position tabs are calculated from
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66420
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Robert Roebling [Mon, 20 Dec 2010 19:15:15 +0000 (19:15 +0000)]
Better wording in docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66417
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Robert Roebling [Mon, 20 Dec 2010 19:13:13 +0000 (19:13 +0000)]
Correction to: Support diabling items in GTK+, see #12686: Allow disabling of wxDVC items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66416
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Mon, 20 Dec 2010 14:54:04 +0000 (14:54 +0000)]
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
Jaakko Salli [Mon, 20 Dec 2010 14:21:13 +0000 (14:21 +0000)]
Use locale-specific decimal point in wxNumericPropertyValidator (fixes #12790)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66411
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Mon, 20 Dec 2010 13:55:40 +0000 (13:55 +0000)]
Added OwnerDrawnComboBoxTestCase (currently only has copies of wxComboBox tests)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66410
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Mon, 20 Dec 2010 13:51:24 +0000 (13:51 +0000)]
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
Jouk Jansen [Mon, 20 Dec 2010 13:33:39 +0000 (13:33 +0000)]
correction to make wxGTK1 compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66408
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Mon, 20 Dec 2010 11:27:13 +0000 (11:27 +0000)]
Have wxUniv wxComboBox inherit from wxItemContainer instead of wxComboBoxBase, since the latter is derived from wxTextEntry which conflicts with the recent change in wxComboCtrl (fixes #12789)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66407
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Mon, 20 Dec 2010 11:23:14 +0000 (11:23 +0000)]
Added dummy-wxTextEntry implementation section for wxUniversal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66406
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jouk Jansen [Mon, 20 Dec 2010 09:23:57 +0000 (09:23 +0000)]
include compile support for tests on OpenVMS (part3)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66405
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Robert Roebling [Sun, 19 Dec 2010 19:43:46 +0000 (19:43 +0000)]
Support diabling items in GTK+, see #12686: Allow disabling of wxDVC items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66404
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 19 Dec 2010 15:02:56 +0000 (15:02 +0000)]
Add the possibility to disable invisible wxDataViewCtrl items.
Add new wxDataViewModel::IsEnabled() and wxDataViewListStore::IsEnabledByRow()
methods and implement support for actually disabling the items in wxOSX/Cocoa
native implementation of wxDataViewCtrl and limited support for it in the
generic version.
We need to implement this in wxGTK using GtkCellRenderer "sensitive" propriety
later.
Closes #12686.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66403
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 19 Dec 2010 15:02:45 +0000 (15:02 +0000)]
Store menus titles in menus themselves in wxOSX.
Get rid of wxMenuBar::m_titles array which doesn't seem to be needed and just
store the titles in the menus themselves instead. This makes wxMenu::GetTitle()
work as in the other ports and fixes unit test failures in menu test.
It also makes it unnecessary to duplicate the base class Find[Menu]Item()
methods in wxOSX wxMenuBar so simply remove them entirely.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66402
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 19 Dec 2010 15:02:38 +0000 (15:02 +0000)]
No real changes, just get rid of _wxMenuAt() in wxOSX menu code.
The _wxMenuAt() function was totally unnecessary and duplicated the existing
wxMenuBar::GetMenu() so simply remove it and use GetMenu() instead.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66401
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 19 Dec 2010 15:02:31 +0000 (15:02 +0000)]
Fix initial gradient point calculation in wxOSX.
This fixes the bug introduced in r63879 which used the wrong indices into the
stops array resulting in visual artefacts in wxAUI, for example (and also
possible crashes due to accessing out of bound array elements).
Closes #12784.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66400
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 19 Dec 2010 14:08:42 +0000 (14:08 +0000)]
Preserve wxSlider value when changing its range in wxOSX too.
This fix is similar to r66368 for wxMSW and preserves the slider value when
its range changes. This is necessary because while the underlying native
control value doesn't change when the range is, the logical value of wxSlider
does change if it must be inversed as this depends on the range.
See #12765.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66399
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Fri, 17 Dec 2010 12:23:34 +0000 (12:23 +0000)]
Make wxOwnerDrawnComboBox sorting identical to the MSW sorting (same as wxComboBox)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66398
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Fri, 17 Dec 2010 12:08:55 +0000 (12:08 +0000)]
Add wxComboBox-compatible Popup() and Dismiss() functions in wxComboCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66397
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Fri, 17 Dec 2010 11:50:54 +0000 (11:50 +0000)]
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
Jaakko Salli [Fri, 17 Dec 2010 11:39:38 +0000 (11:39 +0000)]
Mostly change the wxOwnerDrawnComboBox text value using ChangeValue() instead of SetValue()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66395
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Fri, 17 Dec 2010 11:20:50 +0000 (11:20 +0000)]
Make the wxComboCtrl's wxTextEntry interface more complete and consistent. All text is no longer selected on SetValue(), but only when user selects an item from the drop-down list.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66394
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Robin Dunn [Fri, 17 Dec 2010 00:56:26 +0000 (00:56 +0000)]
Use a " " (space) for the menu item if an empty string is used for an item in a wxChoice, in order to avoid an assert in wxMenuItem.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66391
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Thu, 16 Dec 2010 19:25:31 +0000 (19:25 +0000)]
Removed a return statement from void function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66389
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Thu, 16 Dec 2010 18:13:43 +0000 (18:13 +0000)]
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
Jaakko Salli [Thu, 16 Dec 2010 18:08:16 +0000 (18:08 +0000)]
In wxBitmapComboBox dtor, call DoClear() instead of ambiguous Clear()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66387
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Thu, 16 Dec 2010 18:07:05 +0000 (18:07 +0000)]
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
Jaakko Salli [Thu, 16 Dec 2010 17:21:49 +0000 (17:21 +0000)]
Instead of having wxComboCtrl mimic wxTextEntry interface, make it actually inherit from the class and implement functions to redirect to the embedded wxTextCtrl. This allows us to simplify the code and get rid of the dirty trick of directing wxComboCtrl's validator to the embedded wxTextCtrl. Also see #12779, which issue 1 is fixed by this change.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66385
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Thu, 16 Dec 2010 16:12:55 +0000 (16:12 +0000)]
Document how the sign is omitted from wxFloatProperty's displayed value when it is effectively zero (closes #12738).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66384
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Wed, 15 Dec 2010 13:36:44 +0000 (13:36 +0000)]
Initialize wxLogWindow::m_pLogFrame in ctor to avoid (rare) crash.
If the log frame creation itself generates log messages, the code using
wxLogWindow could crash because its m_pLogFrame member variable wasn't
initialized yet at this moment.
Do set it to NULL initially now to avoid this.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66383
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Wed, 15 Dec 2010 12:04:13 +0000 (12:04 +0000)]
Compilation fixes for wx{X11,GTK1,Motif} after making ref data non copyable.
Don't use wrong compiler-generated copy ctors in the other ports neither (see
r66371..66373 for wxGTK fixes). This fixes compilation after r66374 without
reducing functionality but just making it more clear where it is missing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66382
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Wed, 15 Dec 2010 12:04:02 +0000 (12:04 +0000)]
Compilation fix for wxMotif PCH build.
We need to include wx/unix/utilsx11.h even when using PCH to get
wxCharCodeXToWX() declaration.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66381
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Wed, 15 Dec 2010 12:03:54 +0000 (12:03 +0000)]
Update accelerator unit test to pass after recent changes.
Changes of r66379 broke the unit test as wxAcceleratorEntry::Create() now
requires the TAB to be present in the string passed to it (again).
Update the test to make it pass.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66380
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Wed, 15 Dec 2010 11:18:42 +0000 (11:18 +0000)]
Don't pass strings not containing accelerators to ParseAccel().
Check for the presence of accelerator part in the string passed to
wxAcceleratorEntry::Create() and don't call ParseAccel() at all if it's not
there. This avoids the spurious warnings about unrecognized accelerators when
creating menu items that don't have any accelerators at all.
Also update wxAcceleratorEntry::FromString() documentation to mention that
the new code should pass just the accelerator to this function and that it
only accepts full menu item labels for compatibility.
Closes #12770.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66379
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jouk Jansen [Wed, 15 Dec 2010 10:54:47 +0000 (10:54 +0000)]
Include compilation of tests for OpenVMS (part2)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66378
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jouk Jansen [Wed, 15 Dec 2010 09:51:48 +0000 (09:51 +0000)]
Include compilation of tests for OpenVMS (part1)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66377
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Tue, 14 Dec 2010 18:44:04 +0000 (18:44 +0000)]
Return false, not NULL, from a function returning bool.
Fix a warning (which might be an error with some compilers) about returning
NULL from bool wxRichTextImageBlock::DoMakeImageBlock() function.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66376
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Tue, 14 Dec 2010 18:43:57 +0000 (18:43 +0000)]
No real changes, just add a cast to fix a warning.
Fix warning about implicitly converting -1 to CGKeyCode when building wxOSX
with 10.4 SDK.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66375
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Tue, 14 Dec 2010 18:43:49 +0000 (18:43 +0000)]
Make wxRefCounter non copyable.
wxRefCounter copy ctor was wrong as the new object had the same reference
count as the old one instead of starting its life with reference count set to
1 as any new object should.
While we could fix its copy ctor, it seems to be better to forbid copying
wxRefCounter objects at all because the semantics of doing this is not obvious
and the compiler-generated copy ctor in the derived classes often doesn't do
what the code using it expects it to do, as was discovered by making
wxRefCounter non copyable: see the fixes in the previous commits.
To uncover all such bugs, make wxRefCounter and classes deriving from it non
copyable. If this uncovers more problems, they should be fixed by implementing
copying properly (and explicitly) in the derived classes.
Closes #12768.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66374
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Tue, 14 Dec 2010 18:43:39 +0000 (18:43 +0000)]
Fail in CloneGDIRefData() instead of implementing it incorrectly in wxOSX.
wxIcon and wxMetaFile implemented CloneGDIRefData() using copy ctors of the
corresponding ref data classes but the copy ctors were either wrong (for
wxIconRefData as using it would result in messing up IconRef reference count)
or had wrong semantics (wxMetafileRefData copy ctor performed shallow copy
only while CloneGDIRefData() supposes a deep copy is done).
Replace the wrong implementations of these functions with assert that will be
triggered if they are ever used (which doesn't seem to be the case so far).
See #12768.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66373
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Tue, 14 Dec 2010 18:43:32 +0000 (18:43 +0000)]
Don't use implicit wxBitmapRefData copy ctor in wxGTK code.
wxBitmapRefData didn't have a proper copy ctor but the code in wxGTK wxBitmap
implementation used it nevertheless and then manually patched the newly copied
object to avoid double pointer deletion and other unpleasantness.
Make the code more obviously correct by not using (nor providing) copy ctor at
all. There are no real changes otherwise.
See #12768.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66372
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Tue, 14 Dec 2010 18:43:25 +0000 (18:43 +0000)]
Fail instead of crashing in wxGTK wxCursor::CloneGDIRefData().
CloneGDIRefData() used wxCursorRefData copy ctor which wasn't implemented
correctly and simply copied its internal m_cursor member without incrementing
its reference count which resulted in a crash when it was then dereferenced
twice.
Unfortunately there doesn't seem to be any simple way to clone GDK cursors but
as this should be something only rarely (if ever?) needed, simply don't
implement CloneGDIRefData() at all for now and just leave an assert in it if
it's ever really called. Also don't define wxCursorRefData copy ctor at all as
it can't be done correctly.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66371
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Tue, 14 Dec 2010 18:43:17 +0000 (18:43 +0000)]
Improve wxImage handlers documentation, especially ownership aspect.
Correct wxImage::RemoveHandler() documentation which was plain wrong.
Also mention that the handler will be deleted by wxImage in AddHandler()
documentation.
And add an example of using AddHandler() as well as fix the broken text in
wxInitAllImageHandlers() description.
Closes #12772.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66370
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Mon, 13 Dec 2010 18:10:02 +0000 (18:10 +0000)]
Preserve value when changing range of inverted wxSlider in wxMSW.
The logical value of wxSlider was changed when its range was changed in wxMSW
if the slider had wxSL_INVERSE style because the logical value was actually
computed using the range and the actual physical control value and we forgot
to update the latter when changing the range.
Do update it now in SetRange() to fix this.
Also add unit tests checking for this and, more generally, for other
operations with inversed sliders.
Closes #12765.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66368
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Mon, 13 Dec 2010 16:07:49 +0000 (16:07 +0000)]
Have wxPropertyGrid::DoubleToString() to also take comma into account as a decimal separator. In addition, the function now returns target wxString (makes writing tests easier).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66367
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Sat, 11 Dec 2010 11:57:26 +0000 (11:57 +0000)]
Added code to remove sign from zero in wxPropertyGrid::DoubleToString(). Fixes #12738.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66363
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Sat, 11 Dec 2010 11:48:38 +0000 (11:48 +0000)]
changing compositing mode for Clear, see #12756
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66362
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Tue, 7 Dec 2010 15:46:12 +0000 (15:46 +0000)]
adding support for layout coordinates via insets from framecoordinates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66360
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Tue, 7 Dec 2010 15:41:33 +0000 (15:41 +0000)]
fixing redraw debugging
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66359
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Tue, 7 Dec 2010 13:28:32 +0000 (13:28 +0000)]
attempt at making the line continuation characters stay correct
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66358
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Tue, 7 Dec 2010 10:11:53 +0000 (10:11 +0000)]
updating files list for iphone opengl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66357
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Tue, 7 Dec 2010 09:45:54 +0000 (09:45 +0000)]
updated comment was not saved in former commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66356
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Tue, 7 Dec 2010 09:10:02 +0000 (09:10 +0000)]
updated comment was not saved in former commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66355
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Tue, 7 Dec 2010 08:53:11 +0000 (08:53 +0000)]
reverting content area calculation for iphone as translucent status bars get ignored otherwise
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66354
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Sat, 4 Dec 2010 13:34:19 +0000 (13:34 +0000)]
fixing osx iphone build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66332
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Sat, 4 Dec 2010 13:33:45 +0000 (13:33 +0000)]
guarding compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66331
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Sat, 4 Dec 2010 13:33:20 +0000 (13:33 +0000)]
adapting inheritance to other osx ports
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66330
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Sat, 4 Dec 2010 13:32:51 +0000 (13:32 +0000)]
guarding against non-implemented parts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66329
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Fri, 3 Dec 2010 14:12:23 +0000 (14:12 +0000)]
Rename wxGenericDirCtrl::ExpandDir() to PopulateNode().
This function doesn't really expand anything (unlike CollapseDir()) so give it
a better name while keeping the old one too for compatibility.
See #12735.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66315
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Fri, 3 Dec 2010 14:00:31 +0000 (14:00 +0000)]
Set the window in focus event sent by wxComboCtrl correctly.
The window parameter wasn't copied correctly in the forwarded event. Fix this
and avoid future problems of the same kind by using the copy ctor for creating
the new event and then override the fields that we need to change from the
original event instead of recreating the new event from bits and pieces of the
original one.
Closes #12741.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66314
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775