Commit Graph

5392 Commits

Author SHA1 Message Date
Kinaou Hervé
b64e030f0c Correct implement wxLIST_AUTOSIZE_XXX in the generic wxListCtrl.
Use both the contents and the header width when wxLIST_AUTOSIZE_USEHEADER is
given instead of just the latter.

Also make both wxLIST_AUTOSIZE_USEHEADER and the previously implemented
wxLIST_AUTOSIZE work efficiently for the virtual list controls by reusing
wxMaxWidthCalculatorBase already used in the generic wxDataViewCtrl.

Closes #10326.

(this is a backport of de7e315557 and
0e2d9e539c from master)
2015-09-27 11:57:13 +02:00
Vadim Zeitlin
db56c7bcb8 Merge branch '3.0-osx-fixes' into 3.0
Various fixes for wxOSX back ported from master.
2015-09-11 14:22:42 +02:00
Paul Cornett
6b6832796a Avoid GCC warning: base class should be explicitly initialized in the copy constructor
(cherry picked from commit 67fadfbbf1)
2015-09-06 21:30:04 -07:00
Vadim Zeitlin
2eb5cb50bb Don't keep using invalid wxSound object in the sound sample.
If creating a sound object fails, delete it to ensure that it is recreated
later.

This fixes a minor bug: previously, if an invalid file was used as sound file,
only the first attempt to play it resulted in an error and all the subsequent
ones were just silently ignored. Now every attempt to play an invalid file
results in an error message, as expected.

(this is a backport of a788351eb6 from master)
2015-08-26 15:53:38 +02:00
Vadim Zeitlin
e315ef02c8 Remove wxOVERRIDE not available in 3.0 branch.
Fixes compilation after backporting wxHTTP-in-worker-thread fixes from master.

See #17031.
2015-07-10 13:46:58 +02:00
Vadim Zeitlin
e62173c479 Fix using wxHTTP and wxFTP from worker thread in Unix ports.
This backports e18c8fd29a,
d421373c2e and
6c43aa90b6 from master to avoid crashes when
using wxHTTP or wxFTP from threads other than main.

See #17031.
2015-07-09 20:59:38 +02:00
Vadim Zeitlin
f3fb8fa7c6 Fix harmless warning in ownerdrw sample.
Don't define an unused variable.

Also don't use wxT() unnecessarily.

This is the backport of cd6fb7a9bd and
a1902c1456 from master.
2015-04-17 13:31:24 +02:00
Vadim Zeitlin
fa44ff601e Fix wxVector3f ctor in the propgrid sample.
Even if this code is not used, it was still wrong as it didn't initialize the
(shadowed) member variables, so fix it to actually do it.

See #16342.
2015-04-07 00:09:14 +02:00
Vadim Zeitlin
95d8daae1a No real changes, just removed unused variables from samples.
Don't define constants which are never used to avoid clang
-Wunused-const-variable warnings.
2015-04-07 00:08:11 +02:00
Vadim Zeitlin
01b12b8839 No real changes, just fix some typos in comments in the samples.
Closes #16734 (for 3.0).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-12-16 20:15:56 +00:00
Paul Cornett
8918fb945a fix assert in dataview sample, closes #16679
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-11-21 17:20:04 +00:00
Vadim Zeitlin
6389c36e9b Use wxFILTER_EXCLUDE_CHAR_LIST in the sample.
It makes more sense than wxFILTER_EXCLUDE_LIST with SetCharExcludes().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-11-12 12:37:03 +00:00
Vadim Zeitlin
b8e42da6b2 Fix resource compiler include path for Borland.
Explicitly include $(BCCDIR)/include/windows/sdk directory in the resource
compiler options, as it needs it to find windows.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-11 15:48:22 +00:00
Vadim Zeitlin
7f1e03a22a Rebake and rerun autoconf after 3.0.3 version update.
Don't forget to update configure, this time.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-06 17:33:15 +00:00
Vadim Zeitlin
f8506c65a5 Update version to 3.0.3.
Run misc/scripts/inc_release, update version.bkl and changes.txt manually.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-06 12:35:15 +00:00
Dimitri Schoolwerth
8a35babbbf Fix crash with newer OS X builds running on older.
Use built-in zlib sources instead of system zlib. Backport of trunk
r76382, r76383, and r76385.

Closes #16192.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-03 14:38:11 +00:00
Vadim Zeitlin
05a1abfb1f Fix wxFont construction from default wxFontInfo in wxMSW.
Don't use -1 as the real point size.

Also update the font sample to allow testing such font.

Closes #16468.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-28 12:54:52 +00:00
Vadim Zeitlin
9958ba94b8 Add a more complete example of different controls variants in XRC.
Add a dialog showing all the existing variants of a few common controls to
allow seeing at a glance how do they look.

See #16247.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-03 17:55:52 +00:00
Vadim Zeitlin
f36b3c9d62 Show "hint" wxTextCtrl attribute in the xrc sample.
Rearrange the contents of the wxTextCtrl page in two columns to make space for
the new control.

This should have been part of r76628 but was forgotten.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-03 17:55:48 +00:00
Václav Slavík
96d714660a Add window variant support to XRC.
Fixes #16247.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-03 17:10:49 +00:00
Tim Kosse
63ec0754a3 Fix a compile error with some compilers introduced in r76812.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-10 09:55:19 +00:00
Tim Kosse
b60b063163 Fix compilation if configured with --disable-printarch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-04 12:43:26 +00:00
Tim Kosse
ba2758a28e Items appended via the menu have no item data. Don't crash if right-clicking these items.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-03 16:45:23 +00:00
Tim Kosse
68bd393b27 Disabled bitmaps of toolbar tools are now rendered at the correct position if using GTK3. Extend toolbar sample to include a button with a custom disabled bitmap.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-06-30 18:41:30 +00:00
Vadim Zeitlin
4af9d1aace Generate 64 bit configurations in MSVC 8/9 projects.
Update bakefile configuration to include x64 configurations into MSVS 2005 and
2008 projects (2003 doesn't support building in 64 bits, 2010 and later are
manually maintained and already have them) and rebake the projects.

See #13675.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-06-24 23:52:39 +00:00
Vadim Zeitlin
52b452881f Update the version to 3.0.2 and rebake everything.
This is the result of running misc/scripts/inc_release and bakefile_gen.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-06-16 17:50:58 +00:00
Vadim Zeitlin
8a8fedf3a8 Show the shaped frame with start shape initially in the sample.
It's not clear that setting the window shape actually works if the initial
shape is not set.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-06-10 00:38:09 +00:00
Vadim Zeitlin
f624ceb707 Fix problems due to using "%i" format with size_t in propgrid sample.
Cast size_t value to int when passing it to "%i" format specifier as it has a
different size on LP64 platforms.

Closes #16213.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-04-28 11:32:44 +00:00
Paul Cornett
0dc2d0246d fix transparent window example
wxBG_STYLE_TRANSPARENT can only be set before window creation.
closes #16161


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-04-07 17:15:45 +00:00
Paul Cornett
fa10b28e50 use "new" wx-prefixed macros in samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-30 07:07:55 +00:00
Vadim Zeitlin
37024c991c Fix wxFileSystemWatcher::RemoveAll() to actually work.
We need to call DoRemove() on all watcher objects to really remove them, just
removing our record of them was not enough and e.g. resulted in errors if we
tried to re-add a previously watched path again.

Closes #15531.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-23 00:10:36 +00:00
Robin Dunn
6c0da6f516 Add the ability to show a CallTip in the stc sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-12-29 03:36:24 +00:00
Paul Cornett
21ef119c89 always initialize m_statText
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-25 16:50:06 +00:00
Vadim Zeitlin
5e97ee41d7 Update version to 3.0.1.
And regenerate everything.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-21 13:49:53 +00:00
Vadim Zeitlin
16e9e595c5 Fix wrong printf() format specifiers in the joystick sample.
Use "%ld" for the long values, not "%d", they are not the same under LP64
platforms.

Closes #15691.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-21 00:08:02 +00:00
Vadim Zeitlin
c78cb0d979 Fix assert due to incorrect format being used in listctrl sample.
"%d" can't be used with long wxListEvent::GetIndex() value in 64 bit builds.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-15 13:34:58 +00:00
Vadim Zeitlin
ba58db15e8 Fix format specifiers used for event logging in the listctrl sample.
Don't use "%ld" for int argument (this is harmless but unnecessary) and cast
wxUIntPtr to long before using it with "%ld" as otherwise its size is greater
than that of long in Win64 builds.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-09 13:31:16 +00:00
Vadim Zeitlin
6f6609d233 Avoid pointer conversions to unsigned long in the samples.
This results in errors when using g++ Win64 builds as sizeof(long) <
sizeof(void*) in Win64.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-29 19:20:15 +00:00
Vadim Zeitlin
2f67c4ae07 Make windres command used in MinGW build configurable.
This allows to pass extra arguments to windres, which is especially important
when using 64 bit windres for building 32 bit applications as the generated .o
file uses a wrong architecture unless "-F pe-i386" is explicitly specified.

See #15601.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-26 20:29:57 +00:00
Vadim Zeitlin
16ab50d25b Don't draw the segment lines in wxGtkPrinterDC::DrawArc() unless it's filled.
The segments should only be drawn if we're filling the arc, i.e. drawing a
pie, but not if we're just drawing its outline.

Add a test of this to the printing sample.

Closes #15609.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-25 17:38:43 +00:00
Václav Slavík
e2a8850cc4 XRC: File bugs in wxFileCtrl spec, schema and samples.
Incredibly, there were bugs, inaccuracies or missing content in all
three of them, but each one had its own unique problems.  Fix them all
to be in sync with the implementation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-18 15:00:00 +00:00
Vadim Zeitlin
b84c33c242 Fix syntax error in the dialogs sample after r75028.
An extra "&&" was left in the preprocessor check, remove it.

Also remove the check for __WXMAC_OSX__ as it's unneeded as
USE_NATIVE_FONT_DIALOG_FOR_MACOSX is only defined as 1 under wxOSX and,
actually, wrong, as __WXMAC_OSX__ is never defined anywhere and was probably a
corruption of __WXOSX_MAC__ in the first place.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-17 22:26:50 +00:00
Vadim Zeitlin
853ee8bf12 Get rid of compile- and run-time checks for OS X < 10.5.
As 10.5 is the minimal supported version, it doesn't make sense to check for
it (or even earlier versions) during the build or run-time.

Closes #15580.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-17 12:34:12 +00:00
Julian Smart
4f24610ee9 Fixed image insertion in the wxRTC sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-12 06:15:07 +00:00
Vadim Zeitlin
562a6f3a42 Fix wrong common_samples.bkl include path in animate sample bakefile.
Surprisingly, the wrong path somehow worked all this time and still works in
some installation, but not all of them. Using the correct path shouldn't hurt
though.

Closes #15570.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-09 20:42:49 +00:00
Vadim Zeitlin
fda2a17812 Undo the changes to a sample message catalog by "$Id" removal.
Revert the changes of r74602 to a binary file.

Closes #15563.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-09 10:34:15 +00:00
Vadim Zeitlin
9273033d5a Partially account for the shifted origin in wxBufferedDC.
This change slightly improves wxBufferedDC and wxBufferedPaintDC behaviour
when the origin of the DC is shifted, but they still don't work quite right in
this case as they don't use the buffer area of correct size in this case,
which results in cropping the final bitmap (as can be seen in the drawing
sample, which was modified to show wxBufferedPaintDC in action).

Closes #15497.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-07 09:58:56 +00:00
Julian Smart
a4f491405d Changed the capitalisation of 'span' of Set/GetRow/Colspan to be less jarring
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-05 15:35:05 +00:00
Vadim Zeitlin
9bd574841d Remove unnecessary forward declarations from the docview sample.
MyFrame doesn't exist at all and was just confusing; DrawingView does exist
but is declared in view.h and is not needed in this header.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-04 23:48:15 +00:00
Václav Slavík
62795f413a Misc validity fixes to samples/xrc/rc/*.xrc.
Fix invalid XRC markup.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-03 11:08:54 +00:00