Commit Graph

56 Commits

Author SHA1 Message Date
Vadim Zeitlin
cdc588e4eb Don't resize the parent from wxToolBar::SetSize() in wxUniv
This could result in infinite recursion in wxX11, as the test for the
new size being different from the old one which was supposed to stop the
recursion, failed there in case the new size was 0: as wxX11 can't use 0
size for the window, the actual size was always different and so we kept
sending size events to the parent, which kept resizing the toolbar etc.

It could be argued that there is a bug in wxX11 and that GetSize() must
return the same value as was passed to SetSize(), even if it was 0, and
this might even be correct, in theory, but it doesn't seem worth to do
it just to accommodate this weird use case, especially because resizing
the parent from the child shouldn't be necessary in the first place and
none of wxToolBar implementations in the other ports does it.

So just remove this code completely.

Closes #18554.
2019-11-06 15:06:36 +01:00
Dimitri Schoolwerth
8f8d58d193 Use wx-prefixed macros throughout the repository.
Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE
occurrences to use the wx-prefixed version of the macros.
2015-04-23 22:00:35 +04: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
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
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
57c6f0fe5f don't crash trying to draw buttons with invalid bitmaps (the real fix would be to avoid adding them to the toolbar in the first place, of course...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-03 17:24:51 +00:00
Vadim Zeitlin
0dba08dd39 move SendSizeEvent() down to wxWindow from wxFrame; added SendSizeEventToParent() helper
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-29 12:32:47 +00:00
Vadim Zeitlin
5c68088294 toggle the first button in a radio tools group initially (second version of patch 1469227)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-01 15:06:11 +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
d408730ce4 ensure that wxToolBar has one of wxTB_TOP/LEFT/RIGHT/BOTTOM styles set, otherwise the latest toolbar positioning code breaks down
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-31 13:09:08 +00:00
Robin Dunn
170acdc90e GetBestFittingSize --> GetEffectiveMinSize
SetBestFittingSize --> SetInitialSize
SetBestSize  --> SetInitialSize
SetInitialBestSize --> SetInitialSize


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-31 08:50:17 +00:00
Vadim Zeitlin
10ab355cbd remove manual bitmap greying code with a call to wxImage::ConvertToGreyscale()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-29 20:47:31 +00:00
Vadim Zeitlin
9467bdb7f5 Many changes for wxInputHandler creation mainly related to:
1. Allow the theme to create only the input handlers it customizes instead
   of forcing it to always create a handler even if the standard one is used:
   wxTheme::GetInputHandler() now takes wxInputConsumer to make this possible

2. Prefer delegation to inheritance when creating customized input handlers,
   almost all (except for wxStdScrollbarInputHandler) standard handler classes
   are now private, use wxClassName::GetStdInputHandler() to retrieve the
   standard handler for any class or polymorphic DoGetStdInputHandler()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-14 19:36:47 +00:00
Włodzimierz Skiba
155ecd4c42 Include wx/image.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-03 19:02:54 +00:00
Włodzimierz Skiba
370efbe741 [ 1498016 ] 'Add wxUniv toolbar support wxTB_TEXT style' - with modifications.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-31 18:15:42 +00:00
Włodzimierz Skiba
cc92fd8452 [ 1469227 ] wxUniv patch for toolbar button.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-22 12:03:27 +00:00
Włodzimierz Skiba
76b49cf49b Include wx/frame.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-05 08:10:55 +00:00
Włodzimierz Skiba
e4db172a3b Include wx/log.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-26 08:21:31 +00:00
Julian Smart
32ceccf56f Fix crash caused by last change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-11 14:49:23 +00:00
Julian Smart
c4709ea55c Applied patch [ 1428990 ] wxUniv: patch for toolbar button remain in pressed status
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-11 14:40:41 +00:00
Dimitri Schoolwerth
412e0d47c0 applied patch #1356901 "Yet another removal of extra semicolons", also fixed remaining similar cases of extra semicolons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-20 21:55:35 +00:00
Mart Raudsepp
8907154c1a Nuke #pragma implementation/interface's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 12:56:45 +00:00
Julian Smart
d69225772a Olly Betts' typo patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 09:29:22 +00:00
Włodzimierz Skiba
32b1391332 Warning fixes to unused variables, int/wxChar keycode and other typecasting, not mixing 'type*' and 'type' variables in single line, IsEmpty to empty replacement etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 21:18:04 +00:00
Włodzimierz Skiba
a290fa5a7d Cleaning of sources (Univ related files). -1/TRUE/FALSE/wxIDY_ANY/wxDefaultCoord/whitespaces/!! issues.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-10 13:08:43 +00:00
Julian Smart
655719367a Use old licence name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 20:53:33 +00:00
Julian Smart
77ffb5937e Name and version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 14:56:36 +00:00
Julian Smart
2321962672 Applied patch [ 892511 ] wxUniversal: fix of segfault in toolbar.cpp
Christian Sturmlechner


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-08 11:49:22 +00:00
Julian Smart
6463b9f539 Reverted patch [ 832096 ] Final separation for GUI and console for Open Watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 13:49:22 +00:00
Julian Smart
1169a91932 Applied patch [ 832096 ] Final separation for GUI and console for Open Watcom
(Watcom compiler doesn't like ctor implementation in headers)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 15:33:01 +00:00
Václav Slavík
14f355c2b5 added support for gcc precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 12:46:53 +00:00
Vadim Zeitlin
61fef19b85 warnings (and some errors) fixes for wxUniv DLL build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 20:58:56 +00:00
Mattia Barbon
ac32ba44a1 wxX11 and wxMotif STL-ification, part 1. it does not compile.
yet, but keeps the diff between my local copy and HEAD < 4000
lines...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-21 20:00:38 +00:00
Julian Smart
a8f4cabe1e Applied patch [ 681893 ] Combobox in toolbar
This patch adds controls (i.e. combobox) to toolbars.
It also changes the toolbar sample so the combobox is
actually shown.

Otto Wyss


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-18 09:38:02 +00:00
Julian Smart
d89e39fcdc Added missing wx/frame.h inclusion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-03 15:24:56 +00:00
Julian Smart
dda4f6c089 Applied patch [ 651640 ] Toolbar sizing fix
This patch fixes the problem discussed on wx-dev
mailing list. (Message title "wxUniversal: How is the
parent notified when a child changes its size")

In short:
- This patch makes sure the toolbar notifies the parent of
any size change, this will give the parent the opportunity
to resize the frame client size and to make sure the
toolbar is in the right place.

Hans Van Leemputten


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-10 21:41:31 +00:00
Vadim Zeitlin
2b5f62a0b2 merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
Julian Smart
ee7908dbe9 Added another log.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-30 21:19:41 +00:00
Robert Roebling
72726d27bd some more tweaks were required
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-30 22:53:27 +00:00
Robert Roebling
34d26f42b1 Rewrote wxToolBar another time.
Other minor tweaks.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-30 21:18:39 +00:00
Vadim Zeitlin
d448aec3f3 wxUniv toolbar compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-26 11:30:45 +00:00
Vadim Zeitlin
a9b33d6bb4 compilation fixes for wxUSE_TOOLBAR under MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-15 00:33:05 +00:00
Vadim Zeitlin
6a317e6188 compilation fixes for !wxUSE_TOOLBAR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-14 23:55:16 +00:00
Vadim Zeitlin
8b3fddc493 ignore clicks on a toolbar but outside any button
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-11 11:43:48 +00:00
Vadim Zeitlin
4e89ceb11e don't allow clicking disabled buttons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-28 21:11:41 +00:00
Vadim Zeitlin
5a73d082f0 fixes to toolbar, seems to work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-28 18:07:03 +00:00
Vadim Zeitlin
3216dbf5dc [start of] a wxUniversal implementation of wxToolBar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-27 21:42:48 +00:00
Robert Roebling
bb312b54f6 New code for greying out.
Implemented wxTB_FLAT.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-25 22:56:19 +00:00
Julian Smart
a14a22278a Put tool disabling back in, but we need to debug wxCreateGreyedImage
since the scissors icon in the demo gets munged


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-25 11:35:52 +00:00
Julian Smart
8262f9aecb Commented out the bitmap-greying code until I have time to debug it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-25 11:01:31 +00:00