Commit Graph

190 Commits

Author SHA1 Message Date
Artur Wieczorek
3e62d33935 Update composite wxStringProperty labels and values in propgrid sample.
Set some strings and labels to the more current values.
2015-03-31 19:14:36 +02:00
Artur Wieczorek
e4ea660dfd Fix minor typo in string macro in propgrid sample. 2015-03-29 21:37:33 +02:00
Artur Wieczorek
eb7979d25e Prevent assertion warnings in propgrid sample when "Test ReplaceProperty" is invoked more then once.
New property replacing the old one should have unique name to prevent assertion warning in wxPropertyGridInterfcae::ReplaceProperty when there is checked if property of a given name already exists.
2015-03-28 21:27:06 +01:00
Vadim Zeitlin
4c72988c82 Convert really all CRLF files to use LF in the git repository.
This completes the changes of c3e5751c36.
2015-03-19 21:09:08 +01:00
Artur Wieczorek
4e2b863e3e Restore original grid size when finishing the tests in propgrid sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2015-02-18 17:19:11 +00:00
Artur Wieczorek
0974e13153 Fix "Multiple Columns" test in propgrid sample.
Resize grid to make the results of test visible.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2015-02-18 17:17:23 +00:00
Artur Wieczorek
ac1d0a3a9d Implement more detailed validation of wxArrayDoubleProperty in propgrid sample.
Added wxArrayDoubleProperty::ValidateValue() method checks if pending value is of proper type (wxArrayDouble). Pending value of improper type is used to signal that invalid numeric value was entered into the edit field.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2015-02-17 17:36:00 +00:00
Artur Wieczorek
7b8da40c8e Display additional information for EVT_PG_SELECTED event in propgrid sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2015-02-15 23:26:42 +00:00
Artur Wieczorek
d163bd3bd0 Fix using a value of enumerated type in propgrid sample.
Referring to enumerated type name (wxNumericPropertyValidator::NumericType) in expression is incorrect however it is accepted by VC++. GCC is not so merciful.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2015-02-15 13:52:39 +00:00
Artur Wieczorek
e1286f48f7 Use wxSwap() function to swap values of array elements in wxArrayDoubleEditorDialog::ArraySwap()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2015-02-08 12:51:14 +00:00
Artur Wieczorek
a5718923ad Use bool constants instead of BOOL ones in propgrid sample.
s/FALSE/false/ and s/TRUE/true for the sake of consistency.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2015-02-08 12:48:43 +00:00
Artur Wieczorek
0dc98a7d23 Implement validator for wxArrayDoubleProperty in propgrid sample.
In wxArrayDoubleProperty::DoGetValidator() there is instantiated a wxTextValidator accepting numeric characters, token delimiter and spaces.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2015-02-08 12:45:36 +00:00
Artur Wieczorek
f2016b71b0 Fix small typo in propgrid sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2015-02-04 17:05:37 +00:00
Artur Wieczorek
c1b777cd16 Use wxPG_IMPLEMENT_PROPERTY_CLASS macro in the propgrid sample.
Replace old WX_PG_IMPLEMENT_PROPERTY_CLASS macro with new and simplified wxPG_IMPLEMENT_PROPERTY_CLASS macro.

See #15541

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2015-02-04 16:53:46 +00:00
Artur Wieczorek
9977d7daa9 Refactor propgrid sample (rounding numbers).
Use wxRound function to round floating point numbers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2015-01-21 17:14:22 +00:00
Artur Wieczorek
c529c68c7a Refactor propgrid sample (attribute constants).
Use attribute constants instead of strings when calling wxPGProperty::SetProperty and wxPGProperty::GetProperty in propgrid samples.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2015-01-21 17:11:36 +00:00
Vadim Zeitlin
c2ecbadd3b Fix some typos in the comments and messages in the samples.
Closes #16738.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-12-24 13:57:19 +00:00
Artur Wieczorek
cebc3503d2 Create wxPropertyGridManager with default size in the propgrid sample
Since r78150 wxPropertyGridManager can be created with default size with no issues.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-12-12 22:40:00 +00:00
Artur Wieczorek
86aa298f22 Reactivate 'SetSplitterPosition' test in wxPG sample.
After fixing issues with wxPG manager sizing this test is now passed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-11-15 17:48:54 +00:00
Vadim Zeitlin
2f51147732 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/trunk@77993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-11 16:30:00 +00:00
Vadim Zeitlin
df13791078 Merge wxQT branch into the trunk.
This merges in the latest sources from GSoC 2014 wxQt project with just a few
minor corrections, mostly undoing wrong changes to common files in that branch
(results of a previous bad merge?) and getting rid of whitespace-only changes.
Also remove debug logging from wxGrid.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-24 01:50:11 +00:00
Vadim Zeitlin
202f62b4c4 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.

Closes #13675.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-06-24 23:54:08 +00:00
Vadim Zeitlin
8ef1f74818 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.

Closes #16342.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-06-23 01:08:31 +00:00
Vadim Zeitlin
f7f941a6c1 Fix changing individual font properties in the propgrid sample.
Fixes the bug in the sample which resulted in the UI not working as expected.

Closes #12779.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-22 14:35:55 +00:00
Paul Cornett
8a78ec6b38 fix propgrid sample when WXWIN_COMPATIBILITY_3_0==0, broken in r75561
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-17 17:22:30 +00:00
Vadim Zeitlin
49b8d79c87 Remove (Open)Watcom support.
This compiler is not being developed since several years and almost certainly
can't be used to build the current wxWidgets sources anyhow, so remove all
support for it, including a lot of extremely ugly workarounds for its bugs
with template functions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-16 13:01:06 +00:00
Vadim Zeitlin
0d4ad161d5 Remove support for Win9x from wxMSW.
Most importantly, this allows us to remove all MSLU-related stuff.

Some functions which were previously loaded dynamically can now be just used
directly, too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-16 02:33:40 +00:00
Vadim Zeitlin
01f9accd19 Remove wxPM, wxWidgets port to OS/2.
This port is not used and is not being worked on, so remove it to reduce the
amount of the code which needs to be updated for every global change.

Also remove tests for VisualAge compiler which isn't used since ages.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-15 23:56:58 +00:00
Vadim Zeitlin
f4b80e5337 Remove MSVC6 support.
Don't support this compiler any more, this allows to get rid of tons of
MSVC6-specific workarounds, in particular we can now use Bind() and natural
template functions calls in the library code.

Also remove MSVC6 project and solution files and don't generate them when
bakefile_gen is ran any more (removing the remaining occurrences of msvc6prj
from the bakefiles results in weird bake-time errors, so it's simpler to just
leave them there).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-15 22:32:17 +00:00
Vadim Zeitlin
ebd06e2075 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/trunk@76424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-04-28 11:33:07 +00:00
Paul Cornett
5b4a70247c use "new" wx-prefixed macros in samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-30 07:07:55 +00:00
Paul Cornett
8b4ae731d3 use wxOVERRIDE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-30 00:02:23 +00:00
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
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
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
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
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
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
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
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
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
ce7fe42e84 Provide shorter synonyms for wxEVT_XXX constants.
Use the same short names as are used by the event table macros for the event
type constants themselves. This makes them much more comfortable to use, e.g.
Bind(wxEVT_BUTTON) compared to Bind(wxEVT_COMMAND_BUTTON_CLICKED).

The old long names are still kept for backwards compatibility and shouldn't be
removed as it doesn't really cost anything to continue providing them, but all
new event types should only use the short versions.

Closes #10661.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-25 10:11:03 +00:00
Vadim Zeitlin
22a3b6e4b2 Don't include wxUniversal configurations in MSVC project files.
wxUniversal is practically not used under MSW and just confuses people.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-21 16:37:01 +00:00
Vadim Zeitlin
14b682f7c3 Increase version to 2.9.5.
Rebake all the project/make files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-10 23:51:44 +00:00
Vadim Zeitlin
e709239889 Use wxHAS_IMAGES_IN_RESOURCES instead of explicit platform checks.
Add a special symbol which is defined only if the icons and other images (e.g.
cursor) are in the separate resource files and don't need to be embedded as
XPMs in the main program.

This makes the checks more clear and more customizable as it's enough to
change wxHAS_IMAGES_IN_RESOURCES definition instead of changing many platform
checks.

Closes #14050.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:28:58 +00:00