Commit Graph

28751 Commits

Author SHA1 Message Date
Vadim Zeitlin
cff48ba847 Fix display of right aligned columns in wxGenericListCtrl.
Take into account the width of the image when drawing the right aligned item
in wxGenericListCtrl.

Closes #12562.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-13 22:10:45 +00:00
Vadim Zeitlin
71d6cd60ee Pass last page in wxEVT_WIZARD_FINISHED event.
Delay resetting the wizard page to NULL when it terminates to allow
wxEVT_WIZARD_FINISHED event to carry the correct pointer to the last page.

Closes #12537.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-13 22:10:39 +00:00
Vadim Zeitlin
b7c31456fe Fix print format specifiers used for enum values.
Enums are ints, not longs, so use %d instead of %ld to avoid asserts under LP64
64 bit architectures.

Closes #12556.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-13 22:10:33 +00:00
Vadim Zeitlin
12f6edffd4 Don't return "false" when a pointer is needed.
Return NULL and not false from wxFileTranslationsLoader::
GetAvailableTranslations().

This is, of course, more correct and also fixes a compilation problem with
Borland, see #12558.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-13 22:10:28 +00:00
Vadim Zeitlin
20d88ec692 Move wxList::Member() to pseudo-template base list class.
Member() should be available in all list classes, not just specially crafted
list of wxObjects (wxList).

See #3616.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-10 12:48:36 +00:00
Jaakko Salli
ed8b46bba3 When wxPGProperty is un-attached from wxPropertyGrid, keep its 'default' cell references invalid/NULL (fixes #12552)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-10 09:34:29 +00:00
Jaakko Salli
b3ecee8d12 Also reset DatePicker property editor's global pointer (fixes #11787)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-10 08:32:58 +00:00
Julian Smart
32742d3d9d Compile fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-08 22:17:14 +00:00
Julian Smart
c06f56dd1a Blind fix for Mac compile problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-08 21:51:44 +00:00
Michael Wetherell
15552854db Fix for wxChm
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-08 11:16:54 +00:00
Vadim Zeitlin
b457256985 Don't use default "Error" title for wxMessageOutputBest message box.
Use the application display name as the message box title if possible andu se
"Message" rather than "Error" otherwise.

See #12548.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-07 20:57:40 +00:00
Julian Smart
8995db52f3 Don't use wxDC in header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-06 21:27:07 +00:00
Julian Smart
bec80f4f4a Eliminated redundant wxRichTextAnchoredObject class; refactored XML I/O code
so that objects can stream themselves; added a wxXmlDocument-based method
of writing XML, though this turned out to be much slower than writing directly
so the direct approach is retained and is the default (can be changed with wxRICHTEXT_USE_XMLDOCUMENT_OUTPUT).
Loading and saving new attributes implemented. Added custom properties to objects.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-06 20:22:03 +00:00
Vadim Zeitlin
93f6e00d7b Destroy the in-place edit control in wxGenericListCtrl dtor.
If the in-place text control was still alive when wxGenericListCtrl was
destroyed, it resulted in asserts from wxWindow dtor about child windows still
being alive, so explicitly destroy it from wxListMainWindow dtor.

As this required a slightly different behaviour from wxListTextCtrlWrapper::
EndEdit(), replace its bool argument with an enum one which can take more than
2 values. Not using bool values when calling it also made the code more clear.

Finally, added a unit test verifying that the in-place control is indeed
destroyed correctly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-05 13:38:05 +00:00
Julian Smart
f13d956e6a Removed test code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-05 06:33:34 +00:00
Julian Smart
30f6914ba1 Added a flag suppressing node content conversion when saving to XML.
This helps improve the extremely poor performance of XML saving if
you have, for example, hex data that does not need conversion.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-05 06:17:22 +00:00
Jouk Jansen
16c6c036d3 Update OpenVMS Makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-04 12:20:45 +00:00
Julian Smart
2477747881 wxRTC no longer derives from wxTextCtrlBase; added wxRichTextAttr deriving from wxTextAttr
with CSS-like attributes for future developments; removed image-specific attributes object


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-04 08:37:31 +00:00
Julian Smart
1d12c6e2be Avoid id clashes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-04 08:10:27 +00:00
Vadim Zeitlin
97e07b1cd9 Fix wchar_t with int comparisons for Apple gcc.
Apple gcc refuses to compile comparisons between wchar_t and int for some
reason, so add explicit casts to int to make it work there.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 22:24:03 +00:00
Vadim Zeitlin
864299f799 Fix gcc warnings about comparing iterators with NULL in STL build.
Iterators are not pointers and shouldn't be compared to NULL.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 22:23:51 +00:00
Vadim Zeitlin
b7ff06ad15 Fix use of DELETE and BACKSPACE when starting editing grid with them.
Using the current insertion position in wxGridCellTextEditor::StartingKey()
didn't make much sense, it was always 0 -- so DELETE worked as expected and
did delete the first character of the cell but BACKSPACE never did anything.

Just always delete the first character when DELETE is used and always delete
the last one when BACKSPACE is.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 17:34:22 +00:00
Vadim Zeitlin
6a1e8a634a Fix non-ASCII key handling in wxGrid editors.
Use wxKeyEvent::GetUnicodeKey() correctly, there is no need to guess about
what does it return now that its correct behaviour is documented and
implemented. Simply check if it returns WXK_NONE to check for non-characters.

Also use WXK_START instead of hard-coded 255 when checking GetKeyCode()
result.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 17:34:15 +00:00
Vadim Zeitlin
1b2f7b6d75 Update CRT environment in wxSetEnv() for MinGW too.
MinGW uses the same CRT as MSVC so we can use the same _putenv() call for it
too. This ensures that wxGetenv() returns the value updated by wxSetEnv() and
fixes CrtTestCase::SetGetEnv() unit test when using MinGW.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 17:16:09 +00:00
Vadim Zeitlin
9334ad1727 Correct wxConvAuto::ToWChar() behaviour with wxNO_LEN input size.
We didn't handle the case when the length of the input buffer was not
specified correctly and wxConvAuto::DetectBOM() could read beyond the end of
input. Moreover, the unit test actually relied on this as it didn't pass the
correct length for the literal strings with embedded NULs. This somehow worked
with MSVC but failed with MinGW (see #10713).

Correct the code to handle wxNO_LEN case correctly and fix the unit test to
pass the correct lengths.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 17:15:18 +00:00
Vadim Zeitlin
4cfee1efef Suppress harmless g++ 4.4 warnings about missing braces.
Put braces around MSW-only wxLogXXX() calls to avoid warnings when building
with MinGW 4.4+.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 17:14:08 +00:00
Jaakko Salli
a9afb0576c In wxBitmapComboBox::RecreateControl(), always get recreated control's height from the best size, and also set the ComboBox item height with CB_SETITEMHEIGHT message (fixes #12515).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 10:51:50 +00:00
Tim Kosse
864186dd39 Connect to events only if using native implementation instead of using event table. Closes #12469
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-02 09:39:58 +00:00
Stefan Csomor
4a473abaf2 opening ATSU Font info for Ulrich Telle's wxPDFContext
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 17:30:48 +00:00
Vadim Zeitlin
0e555c213d Correctly convert wxPrintf() to a buffer even when it doesn't fit.
ConvertStringToBuf() helper function was defined incorrectly for converting
wxString to a char* buffer as it didn't fill the buffer at all if the string
didn't fit into it entirely instead of putting as much of the string into it
as possible as was already done for the conversion to wchar_t* buffer. This
broke wxSprintf()-related functions in when the ASCII output buffer was not
big enough as it was not filled at all.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 14:30:41 +00:00
Vadim Zeitlin
66955cc284 Remove out of date code in DoStringPrintfV().
We can't clear a NULL buffer, the code didn't make any sense any more because
it wasn't updated when the function was changed as part of UTF-8 transition.

Closes #12529.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 14:30:06 +00:00
Michael Wetherell
348a9a6ff2 A couple of fixes for wxChm
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 13:09:04 +00:00
Vadim Zeitlin
3a3349f518 More compilation fixes for new wxRTC image code without PCH.
Add more headers needed when not using PCH.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 12:30:02 +00:00
Vadim Zeitlin
ce00f59b5b No changes whatsoever, just remove trailing whitespace.
There are no real changes in this commit but it removes all trailing white
space from our source files. This avoids problems when applying patches and
making diffs and it would be nice to prevent it from reappearing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 11:44:45 +00:00
Vadim Zeitlin
6255fac96f Use Unix EOL format for the new files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 11:31:57 +00:00
Vadim Zeitlin
7132641de7 Include correct headers from richtextimagedlg.*.
Include or forward declares the classes used by the header to make it
self-contained. Do not include wx/wx.h from the source file to make compiling
it faster when not using PCH.

This fixes compilation under Unix after SOC2010_RTC_IMAGES branch merge.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 11:31:04 +00:00
Vadim Zeitlin
00fe363361 Remove interface/implementation #pragmas from richtextimagedlg.*.
These pragmas are not necessary and may actually be harmful, no idea why were
they added in the first place to a new file.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 11:30:58 +00:00
Vadim Zeitlin
cdaed652d7 Merge of SOC2010_RTC_IMAGES branch.
Added floating images and image property dialog to wxRichTextCtrl, by Mingquan
Yang as part of GSOC 2010. Also changed image block creation to use a memory
stream instead of creating a temporary file.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 10:27:07 +00:00
Vadim Zeitlin
a65b84f434 Add EVT_RIBBONBAR_TAB_LEFT_DCLICK event.
Generate a special event when a ribbon bar is double clicked.

Closes #12399.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-29 13:46:35 +00:00
Vadim Zeitlin
4267872212 Fix crash in wxWebKitCtrl when using JavaScript.
Ignore the unknown types of the script result, in particular don't crash
trying to dereference an uninitialized pointer if the script didn't return
anything.

Closes #12361.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-29 13:46:24 +00:00
Vadim Zeitlin
c85a79963d Preserve page size when changing increment in wxGTK wxSpinCtrlDouble.
The page size was wrongly reset when changing the increment before.

See #12342.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-29 13:46:19 +00:00
Vadim Zeitlin
63fb690734 Fix wrong return value of wxGTK wxSpinCtrlDouble::GetIncrement().
Due to confusion in gtk_spin_button_get_increments() parameters order the page
size was returned instead of the increment.

See #12342.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-29 13:46:14 +00:00
Vadim Zeitlin
59b7da02ff Return wxFONTFAMILY_DEFAULT, not UNKNOWN, from wxFont::GetFamily().
Although returning wxFONTFAMILY_UNKNOWN when the font family is not recognized
makes more sense, it breaks a lot of existing code including all the
font-related code generated by DialogBlocks, so prefer to return
wxFONTFAMILY_DEFAULT instead -- which can't be confused for a valid font
family neither but can be passed to wxFont ctor or SetFamily() without
problems.

To ensure that this behaviour is correctly implemented by all ports, rename
the existing wxFont::GetFamily() to DoGetFamily() and call the new method from
wxFontBase::GetFamily() which adjusts the return value if needed.

Closes #12330.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-29 13:46:09 +00:00
Vadim Zeitlin
4a21ea9d9e Improve mouse handling code in wxAuiToolBar.
Capture the mouse to handle mouse input on the buttons to ensure we always
reset the button when the mouse leaves it.

Closes #11784.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-29 13:45:56 +00:00
Jaakko Salli
1e005ad1fd Reset wxPGEditor singleton instance pointers in dtors. This is useful if wxPropertyGrid is being accessed from an external main loop.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-28 18:59:41 +00:00
Vadim Zeitlin
490e22fdd0 Replace some stray _T()s with wxT().
We use wxT() exclusively now so replace some _T()s which crept in unnoticed.

This also fixes compilation using Sun CC.

See #12452.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-27 12:55:28 +00:00
Vadim Zeitlin
0b2a860f0d Use wxString methods for UTF-8 conversions in wxX11 code.
Use wxString::utf8_str() and FromUTF8() to convert to and from UTF-8. This is
more efficient than using wxConvUTF8 as the code did before as it avoids the
conversion entirely when wxString uses UTF-8 internally (as it does by default
in wxX11) and also has the advantage of compiling in STL build unlike the old
code.

Closes #12518.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-27 12:48:21 +00:00
Vadim Zeitlin
02e2609962 Small clean up in wxX11 Pango code.
Don't use unnecessary explicit casts of wxCharBuffer to "const char *".

Use wxCharBuffer::length() instead of strlen().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-27 12:48:14 +00:00
Vadim Zeitlin
80f4c79642 Fix wxX11 compilation when using PCH.
wx/unix/utilsx11.h is not included by wx/wxprec.h so we need to include it
when using PCH too.

Closes #12517.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-27 12:48:07 +00:00
Vadim Zeitlin
ffc71ce59d Close a modal dialog even when it doesn't have any buttons.
The close button in the dialog title bar should work even if there are no
buttons in the dialog itself (unlike the Escape key which works as an
accelerator for a button), so close the dialog explicitly if the emulated
button click wasn't processed in wxDialogBase::OnCloseWindow().

Closes #12513.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-27 11:52:06 +00:00