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

..

cocoa

Typo correction patch [ 1208110 ] Lots of typo corrections

2005-05-31 09:20:43 +00:00

common

Typo correction patch [ 1208110 ] Lots of typo corrections

2005-05-31 09:20:43 +00:00

expat

Make expat's configure detect if -ext o is needed (MW) so tests work correctly.

2005-03-26 04:12:46 +00:00

generic

Merge the cell size attribute the same way that other attributes are

2005-06-01 00:16:41 +00:00

gtk

Temporary fix

2005-05-31 21:56:38 +00:00

gtk1

Temporary fix

2005-05-31 21:56:38 +00:00

html

Typo correction patch [ 1208110 ] Lots of typo corrections

2005-05-31 09:20:43 +00:00

iodbc

Applied patch [ 1183157 ] Compilation with GCC 4.0

2005-04-16 09:45:32 +00:00

jpeg

removed obsolete workspaces

2005-05-18 16:56:52 +00:00

mac

Warning fix and source cleaning.

2005-05-31 12:19:04 +00:00

mgl

Call MGL_init earlier in wxApp::Initialize to avoid crash

2005-04-30 02:09:21 +00:00

motif

Warning fix.

2005-05-31 11:58:04 +00:00

msdos

Add skeleton utils, dir and mimetype for dos.

2005-04-25 09:54:06 +00:00

msw

Try IDC_HAND first and then load "WXCURSOR_HAND" if it fails

2005-06-01 00:11:02 +00:00

os2

Olly Betts' typo patch

2005-05-31 09:29:22 +00:00

palmos

Deprecate wxPathExists, make wxDirExists used everywhere, minor source cleaning.

2005-04-05 16:10:48 +00:00

png

removed obsolete workspaces

2005-05-18 16:56:52 +00:00

regex

removed obsolete workspaces

2005-05-18 16:56:52 +00:00

stc

Baked files for 2.6.1

2005-05-31 16:38:10 +00:00

tiff

Olly Betts' typo patch

2005-05-31 09:29:22 +00:00

univ

Replaced embedded images

2005-05-31 16:17:57 +00:00

unix

Olly Betts' typo patch

2005-05-31 09:29:22 +00:00

wxWindows.xcode

removing C++ std lib

2005-04-21 11:32:19 +00:00

x11

Applied patch [ 1197471 ] Scrolling of Widgets within a wxScrollWindow enabled

2005-05-22 15:57:20 +00:00

xml

Warning fix about assigning unused value + little source cleaning.

2005-03-29 17:28:58 +00:00

xrc

fixed initialization of standard IDs to happen before first use

2005-05-31 22:31:13 +00:00

zlib

CW fix

2005-04-19 12:39:36 +00:00

.cvsignore

…

cwcopysetup.bat

…

cwdcopysetup.bat

…

cygnus.bat

…

makeb32.env

…

makebcc.env

…

makefile.dos

…

makefile.va

…

makefile.vc

…

makeg95.env

…

makelib.b32

…

makelib.bcc

…

makelib.g95

…

makelib.sc

…

makelib.vc

…

makelib.wat

…

makemsc.env

…

makeprog.b32

…

makeprog.bcc

…

makeprog.g95

…

makeprog.msc

…

makeprog.sc

…

makeprog.sl

…

makeprog.va

…

makeprog.vc

…

makeprog.wat

…

makesc.env

…

makesl.env

…

maketwin.env

…

makeva.env

…

makevc.env

…

makewat.env

…

mingegcs.bat

…

mingw32.bat

…

ntwxwin.mak

…

version.mak

…

wxJpeg.icc

…

wxPng.icc

…

wxTiff.icc

…

wxWin.icc

…

Wxwindll.icc

…

wxWindows.dsp

Baked files for 2.6.1

2005-05-31 16:38:10 +00:00

wxWindows.dsw

VC++-generated apparently harmless change

2005-05-18 23:19:30 +00:00

wxWindowsClassicM8.xml

…

wxWindowsM8.xml

line endings corrected, OmnisRC removed

2005-04-21 05:04:12 +00:00

wxWindowsW7.xml

…

wxXpm.icc

…

wxZlib.icc

…