Commit Graph

16454 Commits

Author SHA1 Message Date
Robin Dunn
3100c3dbf3 Merge the cell size attribute the same way that other attributes are
merged, e.g., if it is already set to a non-default value in the
current wxGridCellAttr object then don't merge from the other.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-01 00:16:41 +00:00
Robin Dunn
fe384096fa Try IDC_HAND first and then load "WXCURSOR_HAND" if it fails
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-01 00:11:02 +00:00
Robin Dunn
5854bb83e0 Switch to using wxArtProvider::GetBitmap instead of GetIcon so if the
original image has alpha it is preserved on MSW.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 23:54:40 +00:00
Robin Dunn
0806fc2071 Convert alpha (if any) to mask in wxBitmapToIconOrCursor. Note that
it is possible to put alpha in the icon instead of using a mask, but I
don't have time to figure that out today.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 23:53:09 +00:00
Václav Slavík
3b2a000ef5 fixed initialization of standard IDs to happen before first use
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 22:31:13 +00:00
Julian Smart
34a246df34 Temporary fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 21:56:38 +00:00
Julian Smart
b81383bbd9 Applied patch [ 1212020 ] MediaCtrl DirectShow drawing and sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 21:12:22 +00:00
Julian Smart
47a4a1aec8 Baked files for 2.6.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 16:38:10 +00:00
Julian Smart
13b22a6738 Replaced embedded images
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 16:17:57 +00:00
Vadim Zeitlin
3c96417a09 send wxEVT_SCROLL_CHANGED when using mouse wheel as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 15:33:43 +00:00
Vadim Zeitlin
cbc855087f added wxEVT_SCROLL_CHANGED as synonym for wxEVT_SCROLL_ENDSCROLL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 15:22:10 +00:00
Vadim Zeitlin
2d918775fa document that SetCurrent() must be called on a visible window; assert that this is the case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 15:01:31 +00:00
Vadim Zeitlin
0cf1199546 keep correct default background but allow overriding it in user code too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 14:52:23 +00:00
Julian Smart
123865f20a Restored scrollbar background
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 14:40:34 +00:00
Włodzimierz Skiba
3a39df31ff Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 12:44:15 +00:00
Włodzimierz Skiba
cb9c71ecca Warning fix and source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 12:19:04 +00:00
Włodzimierz Skiba
12cca26a83 Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 11:58:04 +00:00
Julian Smart
19c1b67dd6 Paint bugfix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 11:12:54 +00:00
Julian Smart
22973fe304 Applied Vaclav's gtk_icon_size_lookup_for_settings suggestion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 09:53:06 +00:00
Julian Smart
920a7c1510 Applied patch [ 1208286 ] MediaCtrl DirectShow rewrite
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 09:49:50 +00:00
Julian Smart
2cb1f3dae3 Applied patch [ 1210352 ] Fix editing in generic wxListCtrl with wxLC_EDIT_LABELS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 09:35:07 +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
Julian Smart
3103e8a97e Typo correction patch [ 1208110 ] Lots of typo corrections
Olly Betts


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 09:20:43 +00:00
Stefan Csomor
22e3c5bd85 adding OS level Window Menu by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 05:19:38 +00:00
Robin Dunn
7351db919a Blind fix for bug #1209944, wxFileConfig constructor corrupts the stack
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-30 18:50:26 +00:00
Robin Dunn
eb5e42b615 Allow wxGridCellNumberEditor::StartingKey to work when the control is
a spinctrl too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-30 18:48:23 +00:00
Julian Smart
619be6d0eb WinCE doesn't declare DeleteFile at the point wxRemove is defined,
so put it in implementation file.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-30 13:50:23 +00:00
Julian Smart
306302e12a Applied [ 1208344 ] wxNotebook::OnSelChange fix for focus issue
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-30 11:23:27 +00:00
Włodzimierz Skiba
73f91e1e00 DMC typo fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-30 09:17:26 +00:00
Julian Smart
dd7641ef10 Applied patch [ 1211219 ] Build fix for configurations without wxUSE_LOG
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-30 09:08:49 +00:00
Julian Smart
f6f735d3c2 Applied patch [ 1207531 ] Fix for wxCalendarCtrl being UNUSABLE with some languages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-30 08:45:59 +00:00
Julian Smart
3168b4c3ae Applied patch [ 1208256 ] Fixes bug #1193626 [wxPrintData asserts on or ignores...]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-30 08:39:23 +00:00
Julian Smart
ccbb33c91b Applied patch [ 1207202 ] [wxMSW] Fixes GDI leak in cursor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-30 08:34:56 +00:00
Julian Smart
f05ba7ff38 Applied patch to fix silly filenames in CreateTempFileName
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-30 08:30:43 +00:00
Stefan Csomor
9b58521dc9 cleanup of handlers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-28 06:07:03 +00:00
David Elliott
f22c3fa856 Removed bogus assert for wxGA_SMOOTH.
Implemented vertical gauge (sort of).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-28 02:17:04 +00:00
Julian Smart
12d85b0e02 Added wxSL_INVERSE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-27 15:53:31 +00:00
Michael Wetherell
19b27e78cf wxBase compilation fix for Mac, with help from Ryan
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-27 13:18:50 +00:00
Julian Smart
7529250b88 Removed ugly separators toolbars again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-27 09:14:58 +00:00
Robin Dunn
8e1c7e633e added wxART_NEW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-26 20:54:45 +00:00
Robin Dunn
406011a83d Some tweaks to the temporary art images, added wxART_NEW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-26 19:15:45 +00:00
Robin Dunn
e45b3f17a2 Since Scintilla uses XMP internally which doesn't support alpha, check
if the images have alpha and convert to a mask.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-26 18:07:43 +00:00
Robin Dunn
bfeb1e5838 Don't add extra size to the height, it makes the combo way too big.
(Patch from Ricardo Pedroso.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-26 17:42:07 +00:00
Robin Dunn
311b8d3db7 Patch from Ricardo Pedroso that fixes a segfault when the
wxCAL_SEQUENTIAL_MONTH_SELECTION style is used.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-26 17:33:41 +00:00
Michael Wetherell
096ed1c628 Fix for a wxLogDebug call
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-26 17:09:47 +00:00
Vadim Zeitlin
628eae0bcd apparently the check for too small rect is needed not only with wxNB_MULTILINE (see http://www.solidsteel.nl/users/wxwidgets/viewtopic.php?p=9842#9842)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-25 23:27:34 +00:00
Michael Wetherell
2f73fd3816 Uncomment LVN_ODFINDITEM handler for systems that have NMLVFINDITEM or NM_FINDTIEM
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-25 21:15:47 +00:00
Robin Dunn
d00016f53f delete_ --> delete
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-25 18:01:57 +00:00
Robin Dunn
5a60b5f041 When converting a wxIcon to a bitmap check if the icon has an alpha
channel and set the bitmap to use it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-25 17:06:58 +00:00
Michael Wetherell
8df9a8a047 No wxGetOSFHandle for Wine
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-25 16:05:22 +00:00