Commit Graph

108 Commits

Author SHA1 Message Date
Mattia Barbon
222ed1d678 STL-ification patch for wxMSW and wxGTK.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 19:55:12 +00:00
Vadim Zeitlin
286034884f correction to the separators in vertical toolbar after patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 12:01:15 +00:00
Vadim Zeitlin
f9dae7798b added wxTB_HORZ_TEXT (patch 713813); documented it; moved toolbar styles to toolbar.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 10:53:00 +00:00
Julian Smart
fda7962d02 Applied patch [ 761138 ] Replaces references to wxT("") and _T("") with wxEmptyString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 08:36:14 +00:00
Julian Smart
3bb63e5c80 Partially applied patch [ 763900 ] fix for vertical toolbar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 08:16:00 +00:00
Julian Smart
b39dbf34b8 Applied patch [ 736322 ] Remove TWINE support, merge it in Wine.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-23 19:16:45 +00:00
Vadim Zeitlin
5cb0f77dfe removed unneeded #include dib.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-23 15:46:50 +00:00
Julian Smart
6c9a19aaba Removed erroneous copyright names and corrected licence spelling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 11:23:28 +00:00
Vadim Zeitlin
278c927dd9 removed style parameter from MSWCreateToolbar(), it is unneeded
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-10 23:23:49 +00:00
Julian Smart
8251c0d6ac Added a necessary pixel to height if wxTB_NODIVIDER is specified
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-27 14:40:52 +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
Vadim Zeitlin
4769a56275 compilation fix for !MSVC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-15 15:21:52 +00:00
Vadim Zeitlin
2499871095 recreate the toolbar entirely when its text/icons style changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-14 21:36:18 +00:00
Julian Smart
3bce6687f4 Mods for Wine compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-30 20:34:27 +00:00
Guillermo Rodriguez Garcia
9b601c243f Removed compilation warnings (mostly mismatches between the format string
for debug/trace printfs and the actual parameters, e.g. int vs long, etc)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-26 21:12:25 +00:00
Vadim Zeitlin
bd9cd5343b fixed setting tooltips for slider by moving the code working around comctl32.dll bug from wxToolBar to wxWindow so that it is used for all common controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-06-20 14:49:19 +00:00
Mattia Barbon
fe87983b95 Generate EVT_TOOL_ENTER when the user moves the mouse out of the toolbar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-02 20:03:19 +00:00
Julian Smart
65e5084827 Added wxTB_NODIVIDER and wxTB_NOALIGN so native Windows toolbar can
used in FL.
Adjusted Windows toolbar height for wxTB_NODIVIDER style.
Removed some false memory leak reporting from fontmap.cpp, mimecmn.cpp,
strconv.cpp.
Added and used MapBitmap function in newbmpbtn.cpp so the right
colours are used under Windows.
<controversial>Added iniconf.cpp to WIN32 compilation</conroversial>


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-04 13:13:51 +00:00
Robert Roebling
98b9643647 Minor tweak (up-ported from 2.2.9) to make
flat toolbars look slightly better even
    without rebar controls underneath.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-31 14:06:32 +00:00
Vadim Zeitlin
54b5a79551 fixed compilation error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-26 17:45:04 +00:00
Vadim Zeitlin
f3ba93c1f0 fix for toolbar radio buttons event generation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-26 16:23:35 +00:00
Vadim Zeitlin
c631abdae9 made radio buttons and the toolbat text work for Win32 toolbar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-26 00:44:57 +00:00
Vadim Zeitlin
a3399e6cbe fixed compilation for wxMSW after the recent changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-25 23:14:33 +00:00
Vadim Zeitlin
bd3d0bb953 fixed a bug with client rect calculation in the recent separator erasing fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-15 23:59:43 +00:00
Vadim Zeitlin
7509fa8caa erase separators shown behind the controls added to the toolbar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-15 23:42:42 +00:00
Vadim Zeitlin
bfe9b3dac0 compilation fix for WXWIN_COMPATIBILITY_2_2 == 0 case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-05 16:38:08 +00:00
Mattia Barbon
f538710f0b Fixed toolbar crash for MinGW/Cygwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-16 20:19:16 +00:00
Ron Lee
dd177170f6 fix for mingw which has TBSTYLE_FLAT but not TBSTYLE_TRANSPARENT (yet).
(also submitted to win32api maintainers).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-29 22:30:57 +00:00
Vadim Zeitlin
7d6d3bf31e Windows XP appearance fixes for status and tool bars (bug 501585)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-28 01:38:39 +00:00
Vadim Zeitlin
90c1530adf 0. extracted toolbar colour mapping stuff to its own function
1. wxToolBar adjusts the colours properly when the system colours change
2. wxImageList uses light grey as the transparent colour for the bitmaps


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-13 23:04:11 +00:00
Vadim Zeitlin
39ed8d8a14 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-13 21:00:28 +00:00
Vadim Zeitlin
684c68fd7e really fixed toolbar mapping bug (finally, it was the programmer bug...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-13 20:59:18 +00:00
Vadim Zeitlin
3a3898f8f1 fixed toolbar mapping bug (optimizer bug?) in the release build (bug 501485)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-13 20:45:53 +00:00
Václav Slavík
a756f21001 use the new wxSystemSettings API everywhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-08 23:53:01 +00:00
Vadim Zeitlin
91b13a3ba4 unfortunately the fuzzy colour comparison is really needed (why?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-07 00:38:05 +00:00
Vadim Zeitlin
566fb29935 attemps to speed up wxToolBar::MapBitmap() - failed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-31 02:41:49 +00:00
Mattia Barbon
a95821781b Fixed Cygwin crash on toolbar tooltip
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-19 18:58:04 +00:00
Vadim Zeitlin
a4aad4def6 ignore the border flags for the toolbar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-02 00:42:56 +00:00
Vadim Zeitlin
34e5028ffe position the controls correctly in the vertical toolbars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-27 00:07:09 +00:00
Vadim Zeitlin
de85a884d7 applied patch 473558: fixes for CW compilation under MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-23 20:43:23 +00:00
Mattia Barbon
37d0bdff98 Fixed wxToolbar95::FindToolForPosition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-24 17:30:42 +00:00
Vadim Zeitlin
82c9f85ce5 added wxTLW for MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-24 00:34:14 +00:00
Vadim Zeitlin
c2fd78b10f ~wxToolBar() checks if the frame is being deleted in a better/more clear way
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-24 00:16:48 +00:00
Mattia Barbon
a8945eeff6 * Fixed wxToolbar95 and wxToolbarGTK to emit TOOL_ENTER event with id==-1 when the mouse
leaves a tool.
* Fixed wxToolbar95::FindToolForPosition to take into account dummy spacers inserted
  together with a control for comctl32.dll versions < 4.71


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-23 15:38:01 +00:00
Vadim Zeitlin
bf9b6266fa applied patch 446014 (misc mingw fixes from Mattia)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-02 19:02:17 +00:00
Vadim Zeitlin
84c5b38d57 merged MapBitmap() from 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 17:37:55 +00:00
Vadim Zeitlin
5438a5665e applied patch 439186 (mingw and VC5 fixes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 23:02:09 +00:00
Julian Smart
ae090fdb7f Support for Cygwin 1.0 (thought it worked before, but...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-08 15:04:00 +00:00
Julian Smart
b07664068b Applied patch #420395 (adding wxCLIP_SIBBLINGS capability -- but not by default)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-16 11:14:37 +00:00
Kendall Bennett
33ac7e6f01 Updates to fix Watcom C/C++ 11.0 compiler warning problems. Now compiles
clean with this compiler. Hopefully I did this without breaking other
compilers.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-02 19:48:15 +00:00