Commit Graph

29081 Commits

Author SHA1 Message Date
Vadim Zeitlin
fb1e645577 Don't name variables "id" in public headers.
This name clashes with Objective-C reserved keyword and so prevents the
headers using it from being included from Objective-C++ code.

Closes #12832.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 18:43:30 +00:00
Stefan Csomor
58ce18f2fd fixing warning and compile error against 10.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 18:08:11 +00:00
Stefan Csomor
cc3977bf13 adding new files for xti merge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 17:43:49 +00:00
Paul Cornett
e4c3d9409a build fix for wxUSE_CONSOLE_EVENTLOOP==0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 17:15:37 +00:00
Paul Cornett
424da8bdb9 non-pch build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 17:06:43 +00:00
Vadim Zeitlin
41e1c9d898 Decrease the margins around the page in the print preview.
Don't hard code 40 pixel margins, this may be too big on small screens.

Use twice the default border size between the dialog elements instead, this is
still pretty arbitrary but at least smaller.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 15:57:42 +00:00
Vadim Zeitlin
e562dfb1a0 Don't hardcode wxPreviewControlBar size in print preview code.
For some reason the control bar height was hard coded to 40 pixels which could
be not enough to use the buttons of the appropriate size. Don't hardcode its
size any more and let the sizer determine it instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 15:57:30 +00:00
Vadim Zeitlin
825794618f Improve print preview appearance and functionality.
Allow to directly enter the page number in the print preview itself instead of
opening a separate dialog in order to do it.

Rearrange the buttons in more visually appealing groups and replace the text
arrows in them with the images.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 15:57:21 +00:00
Václav Slavík
8d96f54dfd Debug messages aren't meant to be translated.
Fixed several incorrect uses of _() in dataview_osx.cpp.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 15:34:10 +00:00
Vadim Zeitlin
64d79e1617 Don't use deprecated NSTableView selectRow:byExtendingSelection: method.
Use selectRowIndexes:byExtendingSelection: instead even if this means that we
need to create a trivial NSIndexSet containing a single index only.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 14:58:47 +00:00
Vadim Zeitlin
a9e41db760 Add wxCompositeWindow<> and use it in wxDatePickerCtrlGeneric.
wxCompositeWindow<> is a convenient base class for composite windows, i.e.
windows consisting of several other wxWindows. Currently it just automatically
forwards various attributes setters calls to all of the composite window parts
but it could become more useful in the future.

Similarly, for now it is only used in wxDatePickerCtrlGeneric but it could
(and should) be used for other composite controls later and we probably should
even make this class public to allow its use in the client code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 11:24:13 +00:00
Vadim Zeitlin
b9acd101f7 No real changes, just remove an unneeded header dependency.
There was some commented out code in (core) valgen.cpp file using
wxDatePickerCtrl (from adv library). Also comment out the inclusion of
wx/datectrl.h header as it's not needed as long as this code remains commented
out and creates an unexpected dependency of a core library file on an adv
library header.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 11:23:49 +00:00
Dimitri Schoolwerth
df16cb09b1 Fixed compilation of datectlg.cpp.
Only including wx/datectrl.h does not always include wx/generic/datectrl.h, for example it does not for MSW non-Universal. As a result when compiling datectlg.cpp wxDatePickerCtrlGeneric is unknown and compilation fails. Fixed by including wx/generic/datectrl.h again (regression since r66524).



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 11:01:59 +00:00
Vadim Zeitlin
30d6c59b29 Simplify wxFileNameFromPath() implementation to avoid redundancy.
No real changes, just use wxFileName::GetFullName() in wxFileNameFromPath()
instead of reimplementing it there.

Closes #12818.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 22:04:48 +00:00
Vadim Zeitlin
13705b8ccf Fix memory leak if wxDC::DrawBitmap() fails in wxOS2.
Don't forget to free the buffer if we return abnormally.

Closes #12825.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 22:04:38 +00:00
Vadim Zeitlin
b622441a8d Use correct delete[] for a buffer allocated with new[].
Fix mismatch between scalar new and array delete in GetPathForIconFile() in
wxOSX wxMimeTypeManager code.

Closes #12826.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 22:04:18 +00:00
Vadim Zeitlin
4a40cd9bae Forward declare classes instead of including their declarations.
No real changes, just reduce the compilation dependencies a bit by only
forward declaring wxComboCtrl and wxCalendarCtrl in wx/generic/datectrl.h
instead of including the headers with their full declarations.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 22:03:56 +00:00
Paul Cornett
da2f117200 fix preprocessor expression, closes #12822
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 16:59:15 +00:00
Jaakko Salli
103bfa6f95 Allow any.cpp to compile without wxDateTime support (see #12821)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 16:49:50 +00:00
Jaakko Salli
6f3f38980f Added 'HasAlpha' attribute for wxColourProperty. Setting it to true allows user to edit the alpha component.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 10:14:29 +00:00
Stefan Csomor
2e5f9929e6 pusing a dummy event, to make sure the stop: succeeds in immediate runloop termination, instead of waiting for the next user event
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-01 16:25:37 +00:00
Stefan Csomor
29188693b3 bracketing msw enhanced metafile usage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-01 11:10:35 +00:00
Stefan Csomor
cb98e78b1e fixing iterator comparison
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-01 11:06:16 +00:00
Vadim Zeitlin
91d98deb2f PCH-less compilation fix in recently added wxTangoArtProvider.
The use of wxLogDebug() requires inclusion of wx/log.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 19:38:49 +00:00
Vadim Zeitlin
2e9b5717cd Add wxUSE_ARTPROVIDER_STD build option.
Make it possible to exclude wxDefaultArtProvider from build. Now that a
Tango-based provider exists, it may make sense to disable the standard bitmaps
if the program doesn't need the few of them not provided by Tango anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 17:39:37 +00:00
Vadim Zeitlin
c1d2466a79 Add wxArtProvider using Tango icons.
The icons are embedded as PNG images directly in the source code to avoid the
need for installing them. This does make the library larger though so provide
a wxUSE_ARTPROVIDER_TANGO option to turn the new code and associated bloat off.
Also turn it off by default under wxGTK as the native art provider is used
there anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 17:39:25 +00:00
Vadim Zeitlin
a7cfad3ad6 Add go to first/last and plus/minus art provider icons.
These icons will be used in the upcoming new implementation of the print
preview frame and as they are also natively supported by GTK+ it makes sense
to have support for them in wx itself.

Notice that the existing bookmark add/remove icons are already mapped to the
icons which look like plus and minus signs respectively in wxGTK but we need
plus/minus in print preview in the other ports too so add these icons under
explicit names.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 17:39:01 +00:00
Vadim Zeitlin
19be42b760 Make art provider id of type "char *" instead of "wxChar *".
These strings don't need to be wide and, as elsewhere, prefer the
compatibility with 2.8 ANSI build to compatibility with Unicode build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 17:38:51 +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
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
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
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
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
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
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
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
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
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