Commit Graph

5366 Commits

Author SHA1 Message Date
Vadim Zeitlin
d66e7af9aa Don't use deprecated wxBOLD, wxNORMAL and similar constants.
Replace them with wxFONTWEIGHT_BOLD, wxFONTSTYLE_NORMAL or wxFONTWEIGHT_NORMAL
and equivalents in the code of the library itself and in the samples.

Also simplify font construction using wxFontInfo where possible to avoid
specifying these constants at all if they are not needed.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-01-11 14:25:30 +00:00
Vadim Zeitlin
7696081c90 Remove commented out line from the dnd sample.
No real changes, just remove the unnecessary line and its outdated comment
(wxPaintDC::Clear() can be called in wxGTK, it's just not useful).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-01-11 14:25:21 +00:00
Vadim Zeitlin
47a2c12a32 Fix wrong comment in the scroll sample.
Fix coordinates in the comment to match those used by the code.

Closes #15804.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-01-04 21:58:46 +00:00
Paul Cornett
967a94c91a remove WXWIN_COMPATIBILITY_2_6, add WXWIN_COMPATIBILITY_3_0
closes #15792

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-01-04 20:07:33 +00:00
Robin Dunn
a768c33557 Add the ability to show a CallTip in the stc sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-12-29 03:22:24 +00:00
Paul Cornett
5af1e63c16 always initialize m_statText
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-25 16:50:06 +00:00
Vadim Zeitlin
f269f868d7 Add XRC handler for wxAuiToolBar.
Also add the demonstration of AUI handlers (this one and the existing one for
wxAuiNotebook) to the xrc sample.

See #15686.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-23 00:34:55 +00:00
Vadim Zeitlin
76845041b7 More version change related changes to the generated files.
Somehow not all files seem to have been regenerated after version.bkl change.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-23 00:34:42 +00:00
Vadim Zeitlin
4de86c0b26 Update version to 3.1.0.
And regenerate everything.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-21 13:47:05 +00:00
Vadim Zeitlin
e705b36af5 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/trunk@75253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-21 00:07:30 +00:00
Vadim Zeitlin
c3f4095921 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/trunk@75189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-15 13:33:31 +00:00
Vadim Zeitlin
9b31387508 Merge the changes from 3.0 branch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-12 18:06:37 +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
Julian Smart
f4ac09e8e9 Applied #15539: wxRichTextCtrl: demonstrate adding and deleting table rows and columns in the richtext sample (dghart)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-09-29 12:14:19 +00:00
Paul Cornett
f363cee882 fix building with WXWIN_COMPATIBILITY_2_8 == 0
wxPG_EX_DISABLE_TLP_TRACKING does nothing since r61779


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-09-19 06:16:34 +00:00
Paul Cornett
b59ada676f remove executable property from non-executable files, closes #15504
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-09-16 15:47:27 +00:00
Vadim Zeitlin
e848186687 Add code showing stereo support to the OpenGL cube sample.
Show how WX_GL_STEREO attribute can be used, if available.

See #15434.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-09-15 00:16:44 +00:00
Vadim Zeitlin
e7bdf0ac8d Change version to 3.0.0.
Keep "RC1" in the version string for now, but otherwise all version numbers
should be updated.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-09-11 01:46:08 +00:00
Vadim Zeitlin
c4e9a71a14 Remove unnecessary wxHTML dependency from the notebook sample.
r70321 added html library to the notebook sample, apparently accidentally as
the commit message only mentioned aui one. Remove html and rebake.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-09-04 00:14:34 +00:00
Vadim Zeitlin
f1c4988215 Add a test for a tooltip for a control inside a static box.
Also create the controls as children of the static box, not its siblings, to
make the tooltip work under wxGTK and because this is how we recommend doing
things now.

See #9859.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-09-04 00:14:25 +00:00
Jouk Jansen
8f96683438 Update OpenVMS compile support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-27 12:02:20 +00:00
Vadim Zeitlin
0d53638f71 Fix wxHtmlHelpData::SetTempDir() to behave correctly without trailing slash.
The path passed to this function is always a directory, so use
wxFileName::AssignDir() instead of the default constructor of wxFileName which
considers the name to be a name of a file unless it ends with a path separator.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-23 16:37:09 +00:00
Vadim Zeitlin
2d3ae5c537 Compilation fix to propgrid sample after r74628.
Use wxMax() and wxMin() instead of std::max() and min().

Also work around wrong for loop scoping for VC6.

See #15368.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-07 12:08:10 +00:00
Vadim Zeitlin
33d953e748 Add wxPropertyGridPageState::GetColumnFullWidth().
This method allows to get the full width needed by wxPropertyGrid and is
useful for determining the space to allocate for it, e.g. when creating a
popup showing the property grid, as shown by the changes to the sample.

Closes #15368.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-06 13:05:42 +00:00
Paul Cornett
fea77d88b8 don't pass false as a wxWindowID
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-31 05:56:17 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Vadim Zeitlin
d439c2517e Remove the long obsolete and unused since 2.7.0 __WIN95__ define.
Don't confuse things by defining it unnecessarily.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-13 23:23:19 +00:00
Vadim Zeitlin
7527fdaac8 Add a possibility to change the layout direction in the widgets sample.
This allows to test whether a widget is drawn correctly in RTL variant as well
as the default LTR one easily.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-13 23:23:01 +00:00
Vadim Zeitlin
bd0f3ca697 Rebake all the samples and others makefiles too.
The samples makefiles were not regenerated after the recent Scintilla changes
(see r74425), do it now. There are no real changes for most of them (except
stc sample), but it ensures that rerunning bakefile doesn't change anything.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-13 02:33:00 +00:00
Vadim Zeitlin
c80ae45452 Only link with libwxscintilla if using Scintilla is enabled.
Correct the changes of r74408 to avoid using libwxscintilla if we don't build
it at all.

See #13837.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-06 19:14:59 +00:00
Vadim Zeitlin
a4830bb560 Always add libwxscintilla in monolithic mode.
The library was already present in the makefiles but came before the
monolithic library itself, which broke the linking of the samples when using
GNU ld as the dependent libraries must come after the libraries using them.

Closes #13837.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-06 12:41:02 +00:00
Vadim Zeitlin
bed99c2256 Rebake the rest of the files after TOOLKIT change in MSW bakefile.
This should have been part of r74406 but I only rebaked wxWidgets make/project
files themselves and not the samples/utils/demos files in it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-06 12:32:23 +00:00
Vadim Zeitlin
d1c063b90f Don't ignore child process output if it exits with -1 exit code.
While this code is used by us if the program couldn't be launched at all, it
doesn't mean that it didn't run as -1 could also be returned by the child
process to indicate an error after outputting something, so we should still
read its output in this case.

Closes #15205.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-03 00:33:04 +00:00
Vadim Zeitlin
dc2f83c4f1 Use more readable wxListCtrl::AppendColumn() in the samples.
Call this function instead of InsertColumn() with incrementing indices.

See #15265.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-29 12:52:34 +00:00
Julian Smart
a640295faa Applied patch #15286: documentation and col/rowspan demo by dghart
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-29 10:06:15 +00:00
Steve Lamerton
be2878d8c9 Not not pass debug messages on from wxLogWindow.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-20 14:40:57 +00:00
Vadim Zeitlin
0ec98fd6c9 Improve wxGrid cell wrapping in wxGridCellAutoWrapStringRenderer.
Wrap the words too long to be shown on one line on several lines.

Also take the line breaks and TABs into account.

Closes #15249.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-16 10:50:54 +00:00
Vadim Zeitlin
4e1e8dc51b Change wxMSW wxTreeCtrl::DoFreeze() to not hide the tree any more.
Hiding the tree when it's frozen, as done in r72665, results in its own
problems, e.g. loss of focus. So don't do this but resize the control to a
very small size when freezing it and restore it to its old size afterwards.

Closes #15166.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-05-31 23:21:36 +00:00
Vadim Zeitlin
926df8a162 Add wxFileDialog::GetCurrentlySelectedFilename().
Also send wxEVT_UPDATE_UI events for the extra controls in wxFileDialog.

The combination of these changes allows extra controls to update their state
depending on the current selection in the dialog. Show a simple example of
doing it in the dialogs sample.

Closes #15235.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-05-31 23:21:27 +00:00