Commit Graph

52258 Commits

Author SHA1 Message Date
Vadim Zeitlin
46eada874a Add an option to embed image size in its name to PNG-to-C script.
When a PNG image exists in several sizes it makes sense to use its size as a
suffix to distinguish the different versions, so update the png2c script to
optionally allow to do this.

Current implementation simply checks the PNG header directly to avoid any
extra dependencies.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 17:38:40 +00:00
Vadim Zeitlin
7b8983996e Show wxART_BUTTON icons in art provider sample resource browser.
The button icons have a different size from all the other clients in wxGTK so
it may be interesting to see them in the sample, add wxART_BUTTON to the list
of art clients that can be chosen in it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 17:38:35 +00:00
Vadim Zeitlin
b8502fa7c4 Accept file names with dashes in PNG-to-C converter.
Tango icon files often have dashes in their names so accept them in png2c
conversion script and simply replace them with underscores to form a C
identifier for the array containing the image data.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 17:38:29 +00:00
Vadim Zeitlin
242df7673d Use open command to run the GUI unit test on Mac build slave.
Running the application binary directly still doesn't work quite the same as
when it's opened from Finder (or executed using open) and some tests involving
event loops fail because of this.

Run it using open even if it means that we lose the detailed log output.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 17:29:39 +00:00
Jaakko Salli
7fa3cf6a64 Revert unintended commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 15:23:19 +00:00
Jaakko Salli
4f320d7c57 Try to better revert to the original string value in wxBitmapComboBox::RecreateControl()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 15:20:32 +00:00
Vadim Zeitlin
204530b0f7 Document how to get the previous selection in wxEVT_GRID_SELECT_CELL handler.
Make explicit the fact that the cell coordinates in the event are the
coordinates of the newly selected cell and that the previously selected one is
available from wxGrid itself.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 13:12:56 +00:00
Vadim Zeitlin
0b0bed0fca Move wxMSW wxCommandLinkButton files to native-only part.
wxMSW wxCommandLinkButton implementation shouldn't be used in wxUniv so move
src/msw/commandlinkbutton.cpp and include/wx/msw/commandlinkbutton.h to
ADVANCED_MSW_NATIVE_{SRC,HDR} from ADVANCED_MSW_{SRC,HDR} in files.bkl and
rebake the makefiles.

This fixes wxUniv/MSW compilation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-30 22:37:17 +00:00
Vadim Zeitlin
402bacb376 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
2010-12-30 22:37:10 +00:00
Vadim Zeitlin
9aea251043 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
2010-12-30 22:37:03 +00:00
Vadim Zeitlin
2e49a8074e 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
2010-12-30 22:36:56 +00:00
Dimitri Schoolwerth
b4c470164c 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
2010-12-29 12:31:37 +00:00
Vadim Zeitlin
f74686cba0 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
2010-12-29 00:01:48 +00:00
Dimitri Schoolwerth
3d926ff8a9 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
2010-12-28 22:38:04 +00:00
Dimitri Schoolwerth
5828d76add 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
2010-12-28 22:05:01 +00:00
Dimitri Schoolwerth
2b39567fd4 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
2010-12-28 19:50:41 +00:00
Stefan Csomor
95647df73d removing obsolete NO_PRAGMA
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-28 16:44:15 +00:00
Dimitri Schoolwerth
4324917a76 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
2010-12-28 15:57:44 +00:00
Robin Dunn
05b0355af8 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
2010-12-27 20:47:12 +00:00
Stefan Csomor
e0db57da4c adding backtab to exception list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-27 13:16:54 +00:00
Jaakko Salli
61fac071c3 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
2010-12-27 11:50:34 +00:00
Jaakko Salli
6ea6c5127c Test wxPropertyGrid::DoubleToString()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-27 11:25:53 +00:00
Jaakko Salli
538f4dd82b 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
2010-12-27 11:17:40 +00:00
Stefan Csomor
a46cbd24b4 adding backtab to exception list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-27 06:31:14 +00:00
Stefan Csomor
3a853d9e1e 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
2010-12-27 06:30:42 +00:00
Vadim Zeitlin
e279a9e799 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
2010-12-26 16:29:22 +00:00
Vadim Zeitlin
f740587c9d 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
2010-12-25 14:19:07 +00:00
Vadim Zeitlin
3931f3ecc1 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
2010-12-25 14:18:58 +00:00
Vadim Zeitlin
869704349c 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
2010-12-25 14:18:50 +00:00
Vadim Zeitlin
3013861102 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
2010-12-25 13:46:29 +00:00
Vadim Zeitlin
6f0b6fd1e4 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
2010-12-25 13:46:23 +00:00
Vadim Zeitlin
3256418982 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
2010-12-25 13:19:00 +00:00
Vadim Zeitlin
1db02a5e5c 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
2010-12-25 13:18:52 +00:00
Vadim Zeitlin
5bf7b950a4 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
2010-12-23 12:48:00 +00:00
Vadim Zeitlin
ed8f0b0675 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
2010-12-23 12:47:53 +00:00
Jaakko Salli
db1087d2fd Added dummy GetTextWidget() implementation for wxMotif wxComboCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-23 10:26:06 +00:00
Jaakko Salli
94f090f241 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
2010-12-22 18:44:42 +00:00
Jaakko Salli
95fbeee5ac 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
2010-12-22 17:43:49 +00:00
Jaakko Salli
abbd88b52b 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
2010-12-22 17:25:45 +00:00
Vadim Zeitlin
853149575e 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
2010-12-22 13:57:28 +00:00
Vadim Zeitlin
65776a1582 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
2010-12-22 13:57:21 +00:00
Vadim Zeitlin
fd324b2954 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
2010-12-22 13:57:15 +00:00
Vadim Zeitlin
41271da4af 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
2010-12-22 13:57:08 +00:00
Vadim Zeitlin
ac78a90a1a 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
2010-12-22 13:57:03 +00:00
Vadim Zeitlin
ba67d647e8 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
2010-12-22 13:56:56 +00:00
Vadim Zeitlin
acd0b94c38 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
2010-12-22 13:56:49 +00:00
Robert Roebling
b9293331c6 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
2010-12-21 19:38:52 +00:00
Robert Roebling
d93cc83080 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
2010-12-21 19:27:35 +00:00
Julian Smart
925a662ab0 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
2010-12-21 11:11:25 +00:00
Robert Roebling
e97f9fbd63 Better wording in docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-20 19:15:15 +00:00