Commit Graph

93 Commits

Author SHA1 Message Date
Vadim Zeitlin
4e2756feef Remove remaining occurrences of wxUSE_XPM_IN_MSW.
This symbol is not used since a very long time as XPM support is now always
available in wxMSW and most of its occurrences were removed almost 10 years
ago, just remove the remaining ones too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-03-31 01:11:50 +00:00
Vadim Zeitlin
bb5a951418 Use __WINDOWS__ for OS checks and __WXMSW__ for GUI checks (round 2).
This is continuation of r70796 and serves the same purpose.

Closes #14065, #14066.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 20:31:42 +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
09c0ebcf96 Don't hardcode the number of toolbar tools in the toolbar sample.
Use GetToolsCount() instead of the hardcoded 10 (which can be wrong if any
tools were added or removed).

See #13673.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 12:47:26 +00:00
Vadim Zeitlin
c66c8042ad Corrected handling of wxTB_HORZ_TEXT in the toolbar sample.
The value of flag could be lost when toolbar was recreated without using text
at all.

Closes #13572.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 12:47:23 +00:00
Dimitri Schoolwerth
a1b806b982 Replaced Ok() occurrences with IsOk() throughout trunk.
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk().

Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 16:29:04 +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
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
5276b0a53c Use wxDELETE() and wxDELETEA() when possible.
Use wxDELETE[A]() functions which automatically NULL out their arguments after
deleting them instead of doing it manually.

Closes #9685.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-20 18:18:23 +00:00
Vadim Zeitlin
3cb332c155 Remove unnecessary mondrian.{ico,xpm} files from samples directory.
Standardize on using sample.rc and sample icon in all the samples, it was
confusing that some of them used it and other didn't, without any apparent
logic.

Remove the now unnecessary icon files, including the dialogs sample icon which
seemed to be corrupted (this closes #11146).

Also replace multiple OS/2 resource files with a single one in the sample
directory. The OS/2 projects/makefiles would need to be updated to use them.

Remove dialogs sample icon.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-20 17:42:33 +00:00
Vadim Zeitlin
62f6be4448 Ensure that frame is re-laid out when its toolbar is deleted.
The code in wxFrameBase::SetToolBar() didn't work correctly when toolbar was
unset using SetToolBar(NULL) because the frame toolbar pointer was reset
before layout was done resulting in the frame not recognizing its (still
existing) toolbar child as one of its bars and so nothing was done at all when
the frame had a single child, as in the toolbar sample.

Correct this by carefully ensuring that the toolbar pointer is still set at
the moment of the layout but hide the toolbar to ensure that no place is
allocated for it.

Also mention that it is not necessary to call SetToolBar(NULL) at all if the
toolbar is being deleted anyhow in the sample as toolbar does this itself in
its destructor.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-28 16:18:37 +00:00
Vadim Zeitlin
93ffd498e6 Correct initial value of "Toggle toolbar" check menu item in the sample.
This item should initially be checked because the toolbar is initially shown.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-28 16:18:30 +00:00
Vadim Zeitlin
69bc65e3f8 Remove the test of erase background events from the toolbar sample.
Handling erase background events for toolbars never worked for the ports other
than wxMSW and now it doesn't work for MSW neither as we need to skip erasing
the background in WM_ERASEBKGND handler to avoid flicker which would result
from erasing the background twice, from there and from WM_PAINT handler which
must do it. So don't even try to test if it works, it's unlikely to be very
useful anyhow.

This reverts the change to this file in r62805.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-22 15:37:49 +00:00
Vadim Zeitlin
cc26010927 Add support for stretchable spaces to wxToolBar.
Stretchable spaces consume all extra toolbar space not allocated to the fixed
size items. They can in particular be used to right-align (some) toolbar tools.

Add and document the new API, change the sample to show it and implement it
for MSW, GTK and OS X/Cocoa.

Also refactor MSW background erasing/repainting code to avoid duplicated calls
to DrawThemeBackground(), call it from a new helper MSWEraseRect() function.

Note that we may want to add support for "invisible" separators, IOW
non-stretchable spaces. This could be easily done for MSW after the changes in
this commit and is supported natively by GTK+ and Cocoa so implementing this
would be trivial if there is any interest.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-10 03:04:19 +00:00
Vadim Zeitlin
0639363014 Generate erase background events for native controls too under MSW.
Remove the test which prevented the generation of erase background events from
wxMSW::wxWindow::HandleEraseBkgnd(). Although it is true that native controls
mostly erase background on their own, there are exceptions: we must erase the
background of wxToolBar ourselves, for example. More importantly, there is no
reason to prevent the user code from defining wxEVT_ERASE_BACKGROUND handlers
for the native controls as this works just fine under MSW (although it doesn't
under GTK nor probably other ports...). So also add a test erase background
handler to the toolbar sample to verify that this does work.

Closes #11514.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-07 13:37:01 +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
Vadim Zeitlin
6541fd4b27 compilation fix after wxLoadFileSelector() changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-12 19:37:40 +00:00
Vadim Zeitlin
f2a18fbec6 only allow selecting existing files in wxLoadFileSelector; use this function instead of wxFileSelector in the samples (closes #10693)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-12 18:02:57 +00:00
Vadim Zeitlin
040d3c2ebf restore the default bitmap icons size to 16*15, making them larger if necessary is enough and doesn't result in having ugly 16*16 bitmaps in a 24*24 button rectangle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-04 12:19:45 +00:00
Paul Cornett
dea482c985 fix crash on exit, after hiding search tool then toggling tooltips
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-24 06:48:02 +00:00
Robert Roebling
efdb961d8f Reverted accidental change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-18 08:08:27 +00:00
Robert Roebling
a4f03d8798 Layout improvements for CalendarCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-18 08:01:13 +00:00
Vadim Zeitlin
b3514fd617 MSW fixes for the last change: call Realize() after changing the toolbar; hide/show the window when removing/adding it back as it isn't done by Remove/InsertTool() under MSW unlike under GTK (should it?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-27 00:32:41 +00:00
Vadim Zeitlin
1be45608e7 Several fixes for removing/readding controls to the toolbar:
1. Don't destroy the control in wxToolBar::RemoveTool() as this prevents
   it from being added back with is the purpose of using RemoveTool() rather
   than DeleteTool().

2. Call wxToolBarTool::Attach/Detach() from the base code, not just from wxMSW
   and wxMac (wasn't called by wxGTK at all).

3. Allow adding back the removed control tool in wxGTK.

4. Add test for removing/adding back a control tool to the sample.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-27 00:10:19 +00:00
Vadim Zeitlin
211df0565b add test for setting toolbar background colour
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-02 23:27:20 +00:00
Vadim Zeitlin
4c865f6df3 reverted the last 2 changes to this file, the border stuff has nothing to do with toolbar sample and is really confusing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-02 23:21:36 +00:00
Robert Roebling
6de67633bd More attempts to better support theme borders
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-09 20:57:39 +00:00
Robert Roebling
ef3e6c15f2 added test for simplistic control with border
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-09 12:12:47 +00:00
Julian Smart
079b2f6ba2 Fixed uninstalled toolbars in native toolbar mode, with a method for
specifying non-native if required
Added code to toolbar sample for testing uninstalled toolbar


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-20 14:02:06 +00:00
Vadim Zeitlin
a9a0ceca5b added support for drop down toolbar buttons (patch 1713470)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-11 23:35:49 +00:00
Vadim Zeitlin
cdb11cb99e added labels support for toolbar controls for wxMac and wxMSW (modified patch 1613603)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-18 23:13:18 +00:00
Vadim Zeitlin
f10b672bd8 remove USE_GENERIC_TBAR test: USE_GENERIC_TBAR is not defined anywhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-08 15:05:23 +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
b529726eff Add a few more controls to the toolbar.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-12 21:44:51 +00:00
Vadim Zeitlin
7a9763046b added wxTB_RIGHT style for right-aligned toolbars (slightly modified patch 1567469)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-29 19:12:52 +00:00
Vadim Zeitlin
e112f01999 removed OnToolEnter() handler which interfered with the default tool long help handling; add long help for a couple of tools for testing purposes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-21 15:54:47 +00:00
Włodzimierz Skiba
6bbb8a8d50 Warning fixes and minor source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-10 12:08:52 +00:00
Robert Roebling
5b2acc3a4f [ 1550698 ] Bottom aligned toolbar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-17 11:51:08 +00:00
Václav Slavík
27cc91429d removed wxUSE_TOOLBAR_SIMPLE leftovers from the main sources, it's not used anywhere anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-23 09:54:29 +00:00
Vadim Zeitlin
5e3b8b9301 added a possibility to test how a custom bitmap appears in the toolbar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-25 18:43:23 +00:00
Vadim Zeitlin
f5e6e431ea changed menu accels to not clash with menubar ones
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-04 22:31:44 +00:00
Vadim Zeitlin
6a1b3ead3f added wxTB_NO_TOOLTIPS (heavily modified patch 1458009)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-28 17:17:02 +00:00
Robin Dunn
152e88789d Reverted mistaken check-in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-18 01:52:55 +00:00
Robin Dunn
f460c29d59 Use correct DLL import/export specifier for multi-lib builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-18 01:22:06 +00:00
Włodzimierz Skiba
b20edf8b33 Better #include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 19:06:06 +00:00
Włodzimierz Skiba
5f4d35b804 wxOS2/OW warning and build fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-23 15:54:39 +00:00
Vadim Zeitlin
8927d6d11c don't crash when showing vert toolbar when horz one is not shown
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-01 01:07:28 +00:00
Vadim Zeitlin
7a7d2a14fd don't call SetSize when creating the 2nd toolbar, this just results in unnecessary flicker
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-31 19:00:54 +00:00
Vadim Zeitlin
8d0a7b563a applied heavily modified patch 1116702: support for specifying disabled toolbar images and modified the sample to show how it works (badly, background of tools for which disabled bitmap is not specified is wrong)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-27 18:03:57 +00:00
Mattia Barbon
60c474a0c4 Miscellaneous compilation and warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-06 10:41:35 +00:00