wxWidgets.git
13 years agoFix FileTestCase to really test strings with embedded NULs.
Vadim Zeitlin [Sat, 16 Oct 2010 23:05:26 +0000 (23:05 +0000)] 
Fix FileTestCase to really test strings with embedded NULs.

The test was intended to verify that round trip via wxFile::Write/Read()
worked even for the strings with embedded NULs but as the string wasn't
constructed correctly it didn't actually contain any NULs but was ended by the
first of them.

Fix this by using explicit length of the string as usual when dealing with
strings with embedded NULs. Also fix the conversion back to Unicode to use the
correct length.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoDisable tests for UTF-encoded files in FileTestCase in ANSI build.
Vadim Zeitlin [Sat, 16 Oct 2010 23:05:20 +0000 (23:05 +0000)] 
Disable tests for UTF-encoded files in FileTestCase in ANSI build.

These tests didn't work correctly in ANSI build because the conversion
parameter of wxFile::Write() isn't used there, the contents of an ANSI
wxString is always written to the file as is -- hence reading it back using
UTF-16 or UTF-32 conversion fails.

The test would need to be totally rewritten for ANSI build of wx and it
wouldn't test wxFile but rather conversion functions already tested elsewhere
so just disable it instead.

This fixes a crash (due to passing NULL pointer to memcmp()) which prevented
the test suite from running to completion in ANSI build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoCompilation fix for STL build after r65830.
Vadim Zeitlin [Sat, 16 Oct 2010 23:05:15 +0000 (23:05 +0000)] 
Compilation fix for STL build after r65830.

Explicit conversion from wxString to "const char *" is needed in STL build.
And even in non-STL build it's wrong to rely on implicit conversion as it
wouldn't work correctly in non-UTF-8 locales.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoAvoid crashes in wxGenericListCtrl client<->screen conversion code.
Vadim Zeitlin [Sat, 16 Oct 2010 18:11:32 +0000 (18:11 +0000)] 
Avoid crashes in wxGenericListCtrl client<->screen conversion code.

At least in wxUniv build, DoScreenToClient() can be called before the main
control window is created which results in a crash when attempting to forward
to its DoScreenToClient() version.

Check for m_mainWin being non-NULL before using it to at least avoid the
crash, even if it's not really clear whether this is a 100% correct fix.

Closes #12390.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoImprove wxGTK print and page setup dialogs.
Vadim Zeitlin [Sat, 16 Oct 2010 18:11:27 +0000 (18:11 +0000)] 
Improve wxGTK print and page setup dialogs.

Handle more fields (notably collation, number of copies and "print to file"
flag) and fix the bug with return value of print dialog ShowModal().

Closes #12499.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoTransfer printer name to/from GTK+ native print setup dialog.
Vadim Zeitlin [Sat, 16 Oct 2010 18:11:21 +0000 (18:11 +0000)] 
Transfer printer name to/from GTK+ native print setup dialog.

Printer name in the GTK+ dialog was neither initialized nor retrieved before.

See #12499.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoCorrectly initialize wxGtkPrintNativeData members.
Vadim Zeitlin [Sat, 16 Oct 2010 18:11:15 +0000 (18:11 +0000)] 
Correctly initialize wxGtkPrintNativeData members.

In particular, create a valid GtkPrintOperation object instead of using an
uninitialized pointer to it in wxGtkPrintDialog::ShowModal(), resulting in
crashes or, at best, GTK errors.

Closes #12483.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoRestore text drag-and-drop in wxSTC broken by Scintilla 2 update.
Vadim Zeitlin [Sat, 16 Oct 2010 18:11:06 +0000 (18:11 +0000)] 
Restore text drag-and-drop in wxSTC broken by Scintilla 2 update.

Drag and drop in wxStyledTextCtrl was broken, apparently since upgrade to
Scintilla 2. Restore it by using the correct wxDrag_XXX constants instead of
boolean values in the code for wxEVT_STC_START_DRAG events generation.

Closes #11709.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoDon't return invalid buffer from wxConvertToGTK("").
Vadim Zeitlin [Sat, 16 Oct 2010 18:10:58 +0000 (18:10 +0000)] 
Don't return invalid buffer from wxConvertToGTK("").

The result of wxConvertToGTK() is often passed to GTK+ functions directly and
not all of them handle NULLs gracefully, e.g. gtk_editable_insert_text() just
crashes.

Return an empty string from wxConvertToGTK() explicitly for empty string input
to avoid such problems.

Another potential solution might have been to change wxMBConv::cMB2WC() to
return empty buffer instead of invalid one for empty input but it's not clear
if this is not going to break something else.

Closes #12432.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoAdd wxHAS_3STATE_CHECKBOX symbol.
Vadim Zeitlin [Sat, 16 Oct 2010 18:10:51 +0000 (18:10 +0000)] 
Add wxHAS_3STATE_CHECKBOX symbol.

This symbol is defined for the ports that support wxCHK_3STATE style. While
most of the ports do support it, a couple still do not and having this symbol
makes it more convenient to exclude 3-state-checkbox-specific code, like in
CheckBoxTestCase.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoImprove validation of wxCheckBox styles.
Vadim Zeitlin [Sat, 16 Oct 2010 18:10:42 +0000 (18:10 +0000)] 
Improve validation of wxCheckBox styles.

Detect when incompatible styles are used (this required changing the value of
wxCHK_2STATE to be non-null) and sanitize the styles (after asserting) in this
case.

Put the validation code in wxCheckBoxBase instead of having slightly different
versions of it in port-specific wxCheckBox implementations.

Add a unit test checking that the expected asserts are indeed generated.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoPut libraries in %{_libdir} when building wxGTK RPMs.
Vadim Zeitlin [Sat, 16 Oct 2010 18:10:32 +0000 (18:10 +0000)] 
Put libraries in %{_libdir} when building wxGTK RPMs.

Using the default libdir value ${_prefix}/lib is not always appropriate,
notably this takes care of systems using /usr/lib64 instead of /usr/lib.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoDisabled wxRTC tests that don't work in wxGTK
Julian Smart [Sat, 16 Oct 2010 10:24:42 +0000 (10:24 +0000)] 
Disabled wxRTC tests that don't work in wxGTK

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoClear selection when generic wxDataViewCtrl is cleared.
Vadim Zeitlin [Fri, 15 Oct 2010 23:46:51 +0000 (23:46 +0000)] 
Clear selection when generic wxDataViewCtrl is cleared.

Selection could retain its old value and become invalid after calling Reset()
before.

Closes #12559.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoAdd wx{Pen,Brush}::Is[Non]Transparent() methods and use them.
Vadim Zeitlin [Fri, 15 Oct 2010 23:46:46 +0000 (23:46 +0000)] 
Add wx{Pen,Brush}::Is[Non]Transparent() methods and use them.

Using GetStyle() == wx{PEN,BRUSH}STYLE_TRANSPARENT doesn't work for
uninitialized pen or brush objects so add convenient helpers which do work for
them.

Use the new helper functions everywhere instead of explicitly checking for
style. This makes the code shorter and more clear and also fixes some bugs (at
least those in GTK printing code).

Notice that this patch removes the main reason for explicitly initializing
m_pen and m_brush in wxGTKDCImpl ctor but this initialization still can't be
removed, at least for the latter, as doing this somehow breaks GetPixel(). It
would be nice to understand why and do remove this initialization so that a
newly created DC doesn't have any non-default pen nor brush.

Closes #12522.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoUse wxDCPenChanger instead of setting/resetting pen explicitly.
Vadim Zeitlin [Fri, 15 Oct 2010 23:46:37 +0000 (23:46 +0000)] 
Use wxDCPenChanger instead of setting/resetting pen explicitly.

No real changes, just use wxDCPenChanger instead of manual calls to SetPen()
in wxDCImpl::DrawPolygon(). This makes the code shorter and more clear.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoAdd "GTK" prefix to wxChoice::{Dis,En}ableEvents() methods in wxGTK.
Vadim Zeitlin [Fri, 15 Oct 2010 23:46:32 +0000 (23:46 +0000)] 
Add "GTK" prefix to wxChoice::{Dis,En}ableEvents() methods in wxGTK.

This is more than a cosmetic change: adding "GTK" prefix in wxComboBox and not
doing it in wxChoice in r64436 broke the event generation for wxComboBox as it
didn't override wxChoice methods any longer but defined its own (useless) ones.

Using the same name for the methods in both classes notably fixes unexpected
event generation from wxComboBox::SetSelection().

Closes #12568.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoInclude wx_presets.py in the distribution made by "make dist".
Vadim Zeitlin [Fri, 15 Oct 2010 23:46:24 +0000 (23:46 +0000)] 
Include wx_presets.py in the distribution made by "make dist".

This file is required by "make install".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoCheck for task dialog availability even under Vista and later.
Vadim Zeitlin [Fri, 15 Oct 2010 23:46:19 +0000 (23:46 +0000)] 
Check for task dialog availability even under Vista and later.

Task dialogs are not always available under Vista and later Windows versions
because we might not be using the right (i.e. 6+) version of comctl32.dll.

Improve the check for task dialog availability and fall back to the classic
message box if we can't use it.

Closes #12553.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoRemove all mentions of non-existent contrib from .spec files.
Vadim Zeitlin [Fri, 15 Oct 2010 23:46:13 +0000 (23:46 +0000)] 
Remove all mentions of non-existent contrib from .spec files.

Remove contrib packages from .spec files.

Closes #12567.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoAdd libraries new in 2.9 to wxGTK.spec.
Vadim Zeitlin [Fri, 15 Oct 2010 23:46:09 +0000 (23:46 +0000)] 
Add libraries new in 2.9 to wxGTK.spec.

Add propgrid, ribbon and stc libraries. Correct the name of the media library
("mmedia" was an old contrib library name that doesn't exist any more).

See #12567.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoFix GTK+ development RPM dependency in wxGTK.spec.
Vadim Zeitlin [Fri, 15 Oct 2010 23:46:04 +0000 (23:46 +0000)] 
Fix GTK+ development RPM dependency in wxGTK.spec.

Apparently the standard name for this RPM is gtk2-devel and not
gtk+-2.0-devel, at least rpmfind.net database doesn't have any matches for the
latter and plenty for the former.

See #12567.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoFix button order in wxGTK wxMessageDialog and wxStdDialogButtonSizer.
Vadim Zeitlin [Fri, 15 Oct 2010 23:45:58 +0000 (23:45 +0000)] 
Fix button order in wxGTK wxMessageDialog and wxStdDialogButtonSizer.

The order of buttons in wxGTK wxMessageDialog was accidentally broken since
r55482 and wxStdDialogButtonSizer implementation for wxGTK was subsequently
modified to work in the same way as the broken version of wxMessageDialog.

Fix wxMessageDialog and remove the "compatibility" workarounds from
wxStdDialogButtonSizer to restore correct behaviour in both places.

Closes #12565.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoFix non-PCH builds
Jaakko Salli [Fri, 15 Oct 2010 15:49:00 +0000 (15:49 +0000)] 
Fix non-PCH builds

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoAdded the missing DLL export declaration for wxNumericPropertyValidator
Jaakko Salli [Fri, 15 Oct 2010 15:18:40 +0000 (15:18 +0000)] 
Added the missing DLL export declaration for wxNumericPropertyValidator

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoAdded wxNumericPropertyValidator, which is a custom wxTextValidator with more accurat...
Jaakko Salli [Fri, 15 Oct 2010 15:15:27 +0000 (15:15 +0000)] 
Added wxNumericPropertyValidator, which is a custom wxTextValidator with more accurate filtering of inappropriate input for wxIntProperty, wxFloatProperty and wxUIntProperty (fixes #12563).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoFixed #12566 (assert on deletion) due to inconsistent commit
Julian Smart [Thu, 14 Oct 2010 18:06:02 +0000 (18:06 +0000)] 
Fixed #12566 (assert on deletion) due to inconsistent commit

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agowxUniv/MSW compilation fix.
Vadim Zeitlin [Wed, 13 Oct 2010 23:08:47 +0000 (23:08 +0000)] 
wxUniv/MSW compilation fix.

wxUniv/MSW compilation was broken by r65589, fix it by not assuming that
wxWindowMSW is a wxWindow because wxWindow derives from it in wxUniv.

Closes #12534.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoRegenerate Makefile.in after recent changes to make_dist.mk.
Vadim Zeitlin [Wed, 13 Oct 2010 23:02:50 +0000 (23:02 +0000)] 
Regenerate Makefile.in after recent changes to make_dist.mk.

Rebake with changes of r65800, r65801 and r65802.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoRemove obsolete files from "make dist" rules.
Vadim Zeitlin [Wed, 13 Oct 2010 22:53:54 +0000 (22:53 +0000)] 
Remove obsolete files from "make dist" rules.

Avoid errors due to attempts to copy non-existing files when making Unix
distribution.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoSkip Windows-only samples when making Unix distribution.
Vadim Zeitlin [Wed, 13 Oct 2010 22:53:50 +0000 (22:53 +0000)] 
Skip Windows-only samples when making Unix distribution.

Some samples are by definition Windows-only so they don't have Makefile.in
files for Unix at all, skip them when creating the Unix distribution to avoid
errors due to attempts to copy non-existent files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoInclude include/wx/generic/private/*.h files in distribution.
Vadim Zeitlin [Wed, 13 Oct 2010 22:53:45 +0000 (22:53 +0000)] 
Include include/wx/generic/private/*.h files in distribution.

We must include the generic private files into the distribution as well,
otherwise at least wxGTK fails to build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoFix display of right aligned columns in wxGenericListCtrl.
Vadim Zeitlin [Wed, 13 Oct 2010 22:10:45 +0000 (22:10 +0000)] 
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

13 years agoPass last page in wxEVT_WIZARD_FINISHED event.
Vadim Zeitlin [Wed, 13 Oct 2010 22:10:39 +0000 (22:10 +0000)] 
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

13 years agoFix print format specifiers used for enum values.
Vadim Zeitlin [Wed, 13 Oct 2010 22:10:33 +0000 (22:10 +0000)] 
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

13 years agoDon't return "false" when a pointer is needed.
Vadim Zeitlin [Wed, 13 Oct 2010 22:10:28 +0000 (22:10 +0000)] 
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

13 years agoMove wxList::Member() to pseudo-template base list class.
Vadim Zeitlin [Sun, 10 Oct 2010 12:48:36 +0000 (12:48 +0000)] 
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

13 years agoWhen wxPGProperty is un-attached from wxPropertyGrid, keep its 'default' cell referen...
Jaakko Salli [Sun, 10 Oct 2010 09:34:29 +0000 (09:34 +0000)] 
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

13 years agoAlso reset DatePicker property editor's global pointer (fixes #11787)
Jaakko Salli [Sun, 10 Oct 2010 08:32:58 +0000 (08:32 +0000)] 
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

13 years agoCompile fix
Julian Smart [Fri, 8 Oct 2010 22:17:14 +0000 (22:17 +0000)] 
Compile fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoBlind fix for Mac compile problem
Julian Smart [Fri, 8 Oct 2010 21:51:44 +0000 (21:51 +0000)] 
Blind fix for Mac compile problem

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoFix for wxChm
Michael Wetherell [Fri, 8 Oct 2010 11:16:54 +0000 (11:16 +0000)] 
Fix for wxChm

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoDon't use default "Error" title for wxMessageOutputBest message box.
Vadim Zeitlin [Thu, 7 Oct 2010 20:57:40 +0000 (20:57 +0000)] 
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

13 years agoRemove unnecessary check from IPC sample.
Vadim Zeitlin [Thu, 7 Oct 2010 20:43:20 +0000 (20:43 +0000)] 
Remove unnecessary check from IPC sample.

No real changes, just remove a check for pointer passed to wxDELETE() bot
being NULL as wxDELETE() already checks for this anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoDon't use wxDC in header
Julian Smart [Wed, 6 Oct 2010 21:27:07 +0000 (21:27 +0000)] 
Don't use wxDC in header

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoEliminated redundant wxRichTextAnchoredObject class; refactored XML I/O code
Julian Smart [Wed, 6 Oct 2010 20:22:03 +0000 (20:22 +0000)] 
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

13 years agoMore efficient access to name and value
Julian Smart [Wed, 6 Oct 2010 13:15:24 +0000 (13:15 +0000)] 
More efficient access to name and value

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoDestroy the in-place edit control in wxGenericListCtrl dtor.
Vadim Zeitlin [Tue, 5 Oct 2010 13:38:05 +0000 (13:38 +0000)] 
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

13 years agoDisable TimerEventTestCase::Multiple() test for ANSI wxGTK build.
Vadim Zeitlin [Tue, 5 Oct 2010 13:37:44 +0000 (13:37 +0000)] 
Disable TimerEventTestCase::Multiple() test for ANSI wxGTK build.

This test crashes for unknown reasons on wxGTK ANSI build slave and prevents
the rest of the test suite from running, so disable it for now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoFix harmless unused variables warnings.
Vadim Zeitlin [Tue, 5 Oct 2010 13:37:25 +0000 (13:37 +0000)] 
Fix harmless unused variables warnings.

Don't initialize the variables we never use in richtext sample, this results
in g++ warnings.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoRemoved test code
Julian Smart [Tue, 5 Oct 2010 06:33:34 +0000 (06:33 +0000)] 
Removed test code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoAdded a flag suppressing node content conversion when saving to XML.
Julian Smart [Tue, 5 Oct 2010 06:17:22 +0000 (06:17 +0000)] 
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

13 years agoExports fixed
Julian Smart [Mon, 4 Oct 2010 12:25:27 +0000 (12:25 +0000)] 
Exports fixed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoUpdate OpenVMS Makefile
Jouk Jansen [Mon, 4 Oct 2010 12:20:45 +0000 (12:20 +0000)] 
Update OpenVMS Makefile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoDon't throw assert failure exception in the test suite if it's unsafe.
Vadim Zeitlin [Mon, 4 Oct 2010 10:53:37 +0000 (10:53 +0000)] 
Don't throw assert failure exception in the test suite if it's unsafe.

Don't throw when already handling an exception as it would result in a call to
terminate() and no useful information about the test failure would be given.
Abort ourselves instead to at least give the message about the assert failure.

This should help debug the mysterious ListCtrlTestCase failures in buildbot
wxGTK builds.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoFix timing format string in the test suite.
Vadim Zeitlin [Mon, 4 Oct 2010 10:41:44 +0000 (10:41 +0000)] 
Fix timing format string in the test suite.

wxStopWatch::Time() returns a long value so use %ld, not %d.

This fixes assert failure when using "-t" option with the test suite under 64
bit Unix architectures.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoFix tests compilation with wxUSE_TOOLTIPS==0 as in wxX11.
Vadim Zeitlin [Mon, 4 Oct 2010 10:41:39 +0000 (10:41 +0000)] 
Fix tests compilation with wxUSE_TOOLTIPS==0 as in wxX11.

Unit test suite didn't compile in wxX11 build because it doesn't support
tooltips, just disable the relevant test then.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoRemoved redundant GetEditableWindow on GTK+
Julian Smart [Mon, 4 Oct 2010 09:27:52 +0000 (09:27 +0000)] 
Removed redundant GetEditableWindow on GTK+

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agowxRTC no longer derives from wxTextCtrlBase; added wxRichTextAttr deriving from wxTex...
Julian Smart [Mon, 4 Oct 2010 08:37:31 +0000 (08:37 +0000)] 
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

13 years agoAvoid id clashes
Julian Smart [Mon, 4 Oct 2010 08:10:27 +0000 (08:10 +0000)] 
Avoid id clashes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoFix wchar_t with int comparisons for Apple gcc.
Vadim Zeitlin [Sun, 3 Oct 2010 22:24:03 +0000 (22:24 +0000)] 
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

13 years agoFix wxUSING_VC_CRT_IO definition in the tests when not using MinGW.
Vadim Zeitlin [Sun, 3 Oct 2010 22:23:57 +0000 (22:23 +0000)] 
Fix wxUSING_VC_CRT_IO definition in the tests when not using MinGW.

The condition was always true for non-MinGW compilers because of a missing
pair of parentheses, do add them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoFix gcc warnings about comparing iterators with NULL in STL build.
Vadim Zeitlin [Sun, 3 Oct 2010 22:23:51 +0000 (22:23 +0000)] 
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

13 years agoFix use of DELETE and BACKSPACE when starting editing grid with them.
Vadim Zeitlin [Sun, 3 Oct 2010 17:34:22 +0000 (17:34 +0000)] 
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

13 years agoFix non-ASCII key handling in wxGrid editors.
Vadim Zeitlin [Sun, 3 Oct 2010 17:34:15 +0000 (17:34 +0000)] 
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

13 years agoDisable the use of __thread with MinGW.
Vadim Zeitlin [Sun, 3 Oct 2010 17:16:15 +0000 (17:16 +0000)] 
Disable the use of __thread with MinGW.

__thread keyword doesn't work correctly with at least some MinGW builds and in
particular TLS unit tests failed with the official 4.4 version.

Disable the use of __thread with MinGW entirely for now to be sure that the
generated code behaves correctly. In the future we should white list the known
good versions of MinGW and/or use run-time test for __thread support in
configure instead of compile-time one only.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoUpdate CRT environment in wxSetEnv() for MinGW too.
Vadim Zeitlin [Sun, 3 Oct 2010 17:16:09 +0000 (17:16 +0000)] 
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

13 years agoUse wxUSING_VC_CRT_IO for MSVC CRT-specific test results.
Vadim Zeitlin [Sun, 3 Oct 2010 17:16:00 +0000 (17:16 +0000)] 
Use wxUSING_VC_CRT_IO for MSVC CRT-specific test results.

Move USING_VC_CRT into testprec.h to allow its reuse in other files and rename
it to wxUSING_VC_CRT_IO as it only checks whether we're using MSVC STDIO
implementation and could be false even when we are otherwise using MSVC CRT.

Use this symbol for the tests whose result depends on the concrete version of
the CRT we use.

This fixes StringTestCase::FromDouble() failure under MinGW.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoFix DirTestCase to run on the systems without "C:" drive.
Vadim Zeitlin [Sun, 3 Oct 2010 17:15:52 +0000 (17:15 +0000)] 
Fix DirTestCase to run on the systems without "C:" drive.

"C:" drive doesn't need to exist under Windows, rely on HOMEDRIVE environment
variable defined in all recent Windows versions to get a valid drive letter
(still fall back to "C:" if the variable is not defined -- we could have use
wxFSVolume to find it then but this seems like an overkill).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoRun MBConvTestCase::LibcTests() only for MSVC and not other Windows compilers.
Vadim Zeitlin [Sun, 3 Oct 2010 17:15:46 +0000 (17:15 +0000)] 
Run MBConvTestCase::LibcTests() only for MSVC and not other Windows compilers.

This test fails for MinGW, probably because its CRT doesn't use the same
locale names as MSVC CRT. Just disable it for now, as it was already disabled
for non-MSW platforms.

Also use LocaleSetter class (extracted from CLocaleSetter) to change the
locale for this test duration only to avoid affecting any tests running after
it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoShow the failing string when conversion fails in MBConvTestCase.
Vadim Zeitlin [Sun, 3 Oct 2010 17:15:37 +0000 (17:15 +0000)] 
Show the failing string when conversion fails in MBConvTestCase.

No real changes, just give more information when a test fails in
MBConvTestCase::TestDecoder().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoNo real changes, just simplify some MBConvTestCase code.
Vadim Zeitlin [Sun, 3 Oct 2010 17:15:31 +0000 (17:15 +0000)] 
No real changes, just simplify some MBConvTestCase code.

Remove unnecessary casts and initialize the variable with its contents
directly instead of using strange looking wxWCharBuffer ctor from size_t (even
if it did work, it was unnecessary).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoExclude tests relying on last error being set under MinGW.
Vadim Zeitlin [Sun, 3 Oct 2010 17:15:24 +0000 (17:15 +0000)] 
Exclude tests relying on last error being set under MinGW.

The value of the last error seems to change somewhere between our code and
::GetLastError() call, probably in MinGW CRT, so exclude the tests relying on
it being preserved.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoCorrect wxConvAuto::ToWChar() behaviour with wxNO_LEN input size.
Vadim Zeitlin [Sun, 3 Oct 2010 17:15:18 +0000 (17:15 +0000)] 
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

13 years agoFix VsnprintfTestCase for recent MinGW versions.
Vadim Zeitlin [Sun, 3 Oct 2010 17:15:10 +0000 (17:15 +0000)] 
Fix VsnprintfTestCase for recent MinGW versions.

MinGW now uses its own printf() implementation which handles %p differently
from the VC CRT one and uses %8x instead of %8X for it. Compare the results of
wxPrintf("%p") case-insensitively to let the test pass in any case.

Also introduce a USING_VC_CRT macro instead of testing for
__USE_MINGW_ANSI_STDIO in two different places.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoRemove redundant wxUSE_WXVSNPRINTF checks from the unit test.
Vadim Zeitlin [Sun, 3 Oct 2010 17:15:04 +0000 (17:15 +0000)] 
Remove redundant wxUSE_WXVSNPRINTF checks from the unit test.

The entire VsnprintfTestCase is only used when using our own
wxUSE_WXVSNPRINTF so remove the redundant tests for it inside the enclosing #if.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoFix tests compilation without wxUSE_REGEX.
Vadim Zeitlin [Sun, 3 Oct 2010 17:14:57 +0000 (17:14 +0000)] 
Fix tests compilation without wxUSE_REGEX.

Don't build wxRegEx unit tests when wxUSE_REGEX == 0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoSuppress harmless g++ 4.4 warnings about missing braces.
Vadim Zeitlin [Sun, 3 Oct 2010 17:14:08 +0000 (17:14 +0000)] 
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

13 years agoIn wxBitmapComboBox::RecreateControl(), always get recreated control's height from...
Jaakko Salli [Sun, 3 Oct 2010 10:51:50 +0000 (10:51 +0000)] 
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

13 years agoConnect to events only if using native implementation instead of using event table...
Tim Kosse [Sat, 2 Oct 2010 09:39:58 +0000 (09:39 +0000)] 
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

13 years agoAdd non-vararg wxFileTypeInfo ctor and various setters.
Vadim Zeitlin [Fri, 1 Oct 2010 13:05:42 +0000 (13:05 +0000)] 
Add non-vararg wxFileTypeInfo ctor and various setters.

This allows to create wxFileTypeInfo objects in a more readable even if more
verbose way.

This should also incidentally fix the unit tests compilation with VC6 which
seems to have some existential troubles with the vararg ctor in debug DLL
build (only). Using the non-vararg ctor should hopefully make it happy and let
the unit tests pass with this compiler.

Also document wxFileTypeInfo class which wasn't documented at all.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoAdd wxHAS_BITMAPTOGGLEBUTTON and test for it in the unit test.
Vadim Zeitlin [Fri, 1 Oct 2010 13:05:36 +0000 (13:05 +0000)] 
Add wxHAS_BITMAPTOGGLEBUTTON and test for it in the unit test.

Not all ports define wxBitmapToggleButton class currently, so add a special
symbol which is defined only if this class is indeed available and test for it
in the unit test for this class.

This fixes the tests compilation under wxX11.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoDisable ItemClick() unit test for wxListCtrl under wxMSW.
Vadim Zeitlin [Fri, 1 Oct 2010 13:05:30 +0000 (13:05 +0000)] 
Disable ItemClick() unit test for wxListCtrl under wxMSW.

This test just doesn't want to work on MSW buildbot slaves even though it
works perfectly locally. No idea why but disable it when running on a build
bot slave for now to let the entire test suite pass.

Also add a comment explaining why the test is disabled for wxGTK.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoDisable wxEVT_COMMAND_LIST_ITEM_FOCUSED test for wxMSW.
Vadim Zeitlin [Thu, 30 Sep 2010 17:35:01 +0000 (17:35 +0000)] 
Disable wxEVT_COMMAND_LIST_ITEM_FOCUSED test for wxMSW.

This test fails on MSW buildbot slaves for unknown reasons so disable it to
make the test suite pass. The failure is irreproducible locally so no idea how
to debug this unfortunately.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoopening ATSU Font info for Ulrich Telle's wxPDFContext
Stefan Csomor [Thu, 30 Sep 2010 17:30:48 +0000 (17:30 +0000)] 
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

13 years agoAdd default value for GetPopupMenuSelectionFromUser() position argument.
Vadim Zeitlin [Thu, 30 Sep 2010 14:33:53 +0000 (14:33 +0000)] 
Add default value for GetPopupMenuSelectionFromUser() position argument.

Let the menu be popped up at the system-determined position, just as it can
already be done with PopupMenu() itself.

Closes #12530.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoCorrectly convert wxPrintf() to a buffer even when it doesn't fit.
Vadim Zeitlin [Thu, 30 Sep 2010 14:30:41 +0000 (14:30 +0000)] 
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

13 years agoCorrect handling of %hs and %ls in our wxPrintf() implementation.
Vadim Zeitlin [Thu, 30 Sep 2010 14:30:35 +0000 (14:30 +0000)] 
Correct handling of %hs and %ls in our wxPrintf() implementation.

The strings corresponding to %hs and %ls are always narrow/wide independently
of the build so using wxArgNormalizedString which is defined differently in
different builds doesn't make sense in wxPrintf().

Instead, simply expect the parameter of the appropriate matching type for
these conversion specifications. Any conversions to it, if necessary, had been
already done before by wxFormatString.

This fixes some VsnprintfTestCase::BigToSmallBuffer() unit test failures.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoFix handling of asterisks in wxPrintf() implementation.
Vadim Zeitlin [Thu, 30 Sep 2010 14:30:28 +0000 (14:30 +0000)] 
Fix handling of asterisks in wxPrintf() implementation.

Count the number of asterisks before modifying the string we use to do this,
otherwise we were off by one for the format specifications containing two of
them.

This really fixes the handling of asterisks (used for width/precision) in
wxPrintf() format string, it wasn't done correctly by r60120 but now
VsnprintfTestCase::Asterisk() test does pass.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoExpect an assert in wxVsnprintf() test with too many parameters.
Vadim Zeitlin [Thu, 30 Sep 2010 14:30:23 +0000 (14:30 +0000)] 
Expect an assert in wxVsnprintf() test with too many parameters.

The call to wxPrintf() should provoke an assert if there are too many
parameters, so update the test to expect it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoDisable test failing under VC6 only.
Vadim Zeitlin [Thu, 30 Sep 2010 14:30:18 +0000 (14:30 +0000)] 
Disable test failing under VC6 only.

Somehow the expected assert is not generated by wxString::Format("%d", ptr)
with VC6. Disable this test to make the test suite pass for VC6 for now to at
least be able to monitor the appearance of the new errors in it.

Of course, this one should ideally be debugged (by someone who is interested
in VC6 support) as well...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoInsert another item in the list control in its unit test.
Vadim Zeitlin [Thu, 30 Sep 2010 14:30:13 +0000 (14:30 +0000)] 
Insert another item in the list control in its unit test.

For some reason the test fails with a single item in the control when running
on the buildbot slave, check if this is still the case if we add another item
to the control.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoRemove out of date code in DoStringPrintfV().
Vadim Zeitlin [Thu, 30 Sep 2010 14:30:06 +0000 (14:30 +0000)] 
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

13 years agoA couple of fixes for wxChm
Michael Wetherell [Thu, 30 Sep 2010 13:09:04 +0000 (13:09 +0000)] 
A couple of fixes for wxChm

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 years agoMore compilation fixes for new wxRTC image code without PCH.
Vadim Zeitlin [Thu, 30 Sep 2010 12:30:02 +0000 (12:30 +0000)] 
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

13 years agoNo changes whatsoever, just remove trailing whitespace.
Vadim Zeitlin [Thu, 30 Sep 2010 11:44:45 +0000 (11:44 +0000)] 
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

13 years agoUse Unix EOL format for the new files.
Vadim Zeitlin [Thu, 30 Sep 2010 11:31:57 +0000 (11:31 +0000)] 
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

13 years agoInclude correct headers from richtextimagedlg.*.
Vadim Zeitlin [Thu, 30 Sep 2010 11:31:04 +0000 (11:31 +0000)] 
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

13 years agoRemove interface/implementation #pragmas from richtextimagedlg.*.
Vadim Zeitlin [Thu, 30 Sep 2010 11:30:58 +0000 (11:30 +0000)] 
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

13 years agoMerge of SOC2010_RTC_IMAGES branch.
Vadim Zeitlin [Thu, 30 Sep 2010 10:27:07 +0000 (10:27 +0000)] 
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