Commit Graph

74 Commits

Author SHA1 Message Date
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
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
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
cc699de848 Added wxSimplebook class: a wxBookCtrl without controller.
This new control allows the program to show one of the several pages without
allowing the user to change them (or even see that there are several of them)
himself.

This class is fully inline, so it doesn't add anything to the library and
hence doesn't need neither wxUSE_SIMPLEBOOK nor the corresponding configure
option.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-08-30 20:21:54 +00:00
Vadim Zeitlin
9ed3454e3d Remove unnecessary TranslateBookFlag() from the notebook sample.
It probably was needed before, when the flags had different values for
different controls, but is simply unused now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-08-30 20:21:06 +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
Vadim Zeitlin
864181f4f6 Implement wxNotebook::CalcSizeFromPage() for wxGTK.
The implementation is far from perfect as it relies on hard-coded margins but
is better than nothing as it allows wxNotebook best size determination and
SetPageSize() method to work correctly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 18:19:26 +00:00
Steve Lamerton
873ff54b1f Derive wxAuiNotebook from wxBookCtrlBase. Document wxAuiNotebookEvent which now derives from wxBookCtrlEvent. Update the notebook sample to add wxAuiNotebook as an option.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-02 10:29:00 +00:00
Vadim Zeitlin
c7e94140cd Change wxNotebook selection before sending page changed event in wxMSW.
wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED handler should see the new page selected
in the control, not the old one as was the case if the page was changed using
the mouse in wxMSW.

This should have been done together with the other changes of r66224, see its
commit message for more details.

Closes 13145.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-23 16:19:15 +00:00
Vadim Zeitlin
bd448041e7 Always use icons with wxToolbook in the notebook sample.
wxToolbook asserts and doesn't work if it has no images so always use them
with it in the sample to avoid it.

Closes #11656.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-15 11:10:46 +00:00
Vadim Zeitlin
8864388cf2 Show wx{Note,Tool}book-specific styles in the notebook sample too.
Demonstrate the use of styles such as wxNB_FIXEDWIDTH or wxTBK_HORZ_LAYOUT
specific to particular controls and not only the ones common to all of them.

Closes #13036.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-14 11:55:05 +00:00
Vadim Zeitlin
18f42b94df Remove calls to wxApp::SetTopWindow() from the samples and documentation.
It is definitely not necessary to call SetTopWindow() when there is only a
single top level window and it is arguable whether it's useful to do it even
when there are many of them so don't encourage its use in the documentation
and also remove all its occurrences from the samples.

Closes #12816.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 22:05:14 +00:00
Vadim Zeitlin
f7aaef4d53 Test both ChangeSelection() and SetSelection() in notebook sample.
Test wxBookCtrl::SetSelection() too to be able to check that it does generate
events as expected.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-07 19:33:22 +00:00
Vadim Zeitlin
fab8784c71 Treat wxToolbook symmetrically with others in the notebook sample.
Use wxToolbook as the default notebook type if the other ones are not
available.

Closes #12610.

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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 11:44:45 +00:00
Vadim Zeitlin
526954c596 Globally use "wxWindows licence" consistently.
Use "wxWindows licence" and not "wxWidgets licence" (the latter doesn't
exist) and consistently spell "licence" using British spelling.

See #12165.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-13 13:29:13 +00:00
Vadim Zeitlin
119629aa5d Correct notebook sample layout.
Use a sizer for the frame to make sure its initial and minimal size correspond
to the best size of the panel inside it. Also add a Layout() call on the panel
which was somehow not done initially. And finally don't centre the frame, this
is unnecessary.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-22 11:58:50 +00:00
Vadim Zeitlin
76680db44a Avoid conflict between accelerators in the notebook sample.
Ctrl-5 was used both for the treebook in the "Type" menu and default
orientation choice in the "Orientation" menu.

Use Alt-[0..4] for the "Orientation" menu entries.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-03-05 23:55:14 +00:00
Paul Cornett
abae3b805f fix broken #elif
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-01-08 04:05:31 +00:00
Vadim Zeitlin
9a83f86094 Globally replace _T() with wxT().
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-23 20:30:22 +00:00
Francesco Montorsi
425ec0a5a3 no real change: just reorder the code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-04 15:23:56 +00:00
Vadim Zeitlin
81d3348a9b replace wx_{const,static,reinterpret}_cast with their standard C++ equivalents
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-02 02:43:11 +00:00
Vadim Zeitlin
92c01615ec remove/replace redundant SetAutoLayout() and Fit() calls, leave just SetSizer[AndFit]() ones (patch 1905759)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-15 02:08:02 +00:00
Julian Smart
a7dbf7c8bc Removed double border style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-15 20:29:53 +00:00
Vadim Zeitlin
45e6e6f8ab call OnInit() from all samples to allow using standard command line options with all of them (patch 1623971)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-04 00:34:18 +00:00
Robert Roebling
a85dda4ad8 Test adding page without setting selection.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-04 18:24:07 +00:00
Vadim Zeitlin
1d6fcbcc70 added wxBookCtrl::ChangeSelection() which is the same as SetSelection() but doesn't send the page change events (second part of patch 1553551)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-08 17:37:23 +00:00
Włodzimierz Skiba
9804d5404a wxNB_HITTEST_* flags renamed to wxBK_HITTEST_* to serve all book controls.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-05 12:21:13 +00:00
Vadim Zeitlin
df1496e3eb context help for notebook pages tests added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-14 18:32:26 +00:00
Vadim Zeitlin
d0a84b6338 fill in flags parameter of HitTest() for all book controls; added new wxNB_HITTEST_ONPAGE bit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-14 15:54:24 +00:00
Vadim Zeitlin
9d5371c60b renamed AddSubPage() with pos parameter to InsertSubPage()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 12:27:20 +00:00
Julian Smart
d709457c8d Adapted notebook sample to demonstrate wxToolbook
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-30 15:40:32 +00:00
Vadim Zeitlin
582ca3535a don't use wxStaticCast to wxBookCtrlBase -- it doesn't work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-16 16:31:35 +00:00
Włodzimierz Skiba
2ddb4d1358 Unified flags for orienting wxBookCtrls (with backward compatibility). Centralised code for sizing internals.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 19:03:06 +00:00
Vadim Zeitlin
136bafcd39 compilation fixes for wxUSE_TREEBOOK=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-09 22:09:35 +00:00
Vadim Zeitlin
eca15c0d54 Added wxTreebook:
- added the control itself
- added protected wxBookCtrlBase::AllowNullPage() to accommodate it
- big changes to the sample to get rid of (most) ugly macros
- added XRC handler for the control
- added docs
- and wxUSE_TREEBOOK everywhere


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-09 18:40:36 +00:00
Vadim Zeitlin
d52f6c4eed use generic sample icon; no need for separate .rc file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-17 14:36:24 +00:00
Włodzimierz Skiba
5a053c22d8 Better margin on Smartphone.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-13 15:35:33 +00:00
Włodzimierz Skiba
53d09d5558 Use initial book from available controls. Select it in menu correctly.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-10 19:34:58 +00:00
Włodzimierz Skiba
11d1f1599c wxUSE_LOG (Smartphone) fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-06 12:30:08 +00:00
Włodzimierz Skiba
61c083e781 wxBookCtrl->wxBookCtrlBase. wxBookCtrl is now most suitable book for given platform. Samples adjustement.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 11:45:07 +00:00
Vadim Zeitlin
6e9324fc52 removed duplicated code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 16:49:15 +00:00
Włodzimierz Skiba
c0c997853f Keys to some operations (patch #1037434).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 20:11:24 +00:00
Włodzimierz Skiba
02161c7c81 wxUSE_*BOOK checks.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 13:45:52 +00:00
Włodzimierz Skiba
9133965ef5 Notebook sample redesign. Now it is 'wxNotebook & friends' and presents wxChoicebook and wxListbook without need of recompilation. User interface moved from buttons to menus in order to work with limited devices (lack of button control in Smartphones). Added presentation of default orientation in controls.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-17 17:39:53 +00:00
Vadim Zeitlin
33ebfc3b9b made wxListbook events more consistent with wxNotebook ones (patch 1001271)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-16 22:14:34 +00:00
Włodzimierz Skiba
f07941fc73 wxUSE_LOG fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-20 19:11:34 +00:00
Włodzimierz Skiba
422d0ff0be wxDefaultSize.* and wxDefaultPosition.* to wxDefaultCoord.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-20 10:09:47 +00:00
Włodzimierz Skiba
134155b159 Removal of deprecated methods.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-13 13:24:57 +00:00
Robin Dunn
37144cf0f1 Invalidate notebook best size when pages are added or removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-03 15:49:29 +00:00