Commit Graph

100 Commits

Author SHA1 Message Date
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
a38d058525 fixed bug in SetStyle() which wouldn't reset the slant if it had been set before
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-27 16:05:35 +00:00
Guillermo Rodriguez Garcia
4244c20bf5 Fixed warnings due to use of %d for long int params in function
wxNativeFontInfo::ToString()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-26 22:54:25 +00:00
Julian Smart
93692400d0 Initialise font family when initializing from native font, since this
is otherwise uninitialised (the font family is taken from the ref data and
not the native font data).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-06-11 22:07:38 +00:00
Václav Slavík
142b3bc26a added wxFontMapper::Get/Set
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-06 15:04:27 +00:00
Vadim Zeitlin
9cf8de4c74 implemented IsFixedWidth() correctly for MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-26 22:29:37 +00:00
Robin Dunn
36e2bb4eed Added missing wxNativeFontInfo::GetFamily(). I think I did it right
but somebody who knows should check it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-05 22:47:13 +00:00
Vadim Zeitlin
e7e52b6d2f compilation fixes for !wxUSE_FONTMAP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-30 22:29:44 +00:00
Václav Slavík
49eb2344d5 Idiot I am; my previous commit certainly broke non-Unicode builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-27 23:16:18 +00:00
Václav Slavík
5d32001b32 fix for unicode crashes by Dimitri
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-27 18:06:34 +00:00
Vadim Zeitlin
5e968b7452 changed the default font facename for the decorative family - is it correct for Win9x?
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-24 01:18:06 +00:00
Vadim Zeitlin
7936354da7 code clean up, avoid duplicating the same code in font.cpp and fontutil.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-24 01:06:15 +00:00
Vadim Zeitlin
bff67a6a81 use wxFontMapper when setting the encoding (fix to restore the behaviour broken by the native font info change)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-23 23:53:46 +00:00
Vadim Zeitlin
a9249b2eb2 wxFont can now raelly use the native fonts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-22 03:31:48 +00:00
Vadim Zeitlin
7ecb8b06ad don't use wxTheXXXList in wxXXX ctor/dtor, only objects explicitly created
with FindOrCreateXXX() are managed by the lists


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-20 18:40:03 +00:00
Julian Smart
04ef50df3a First pass at adding MicroWindows support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 10:58:59 +00:00
Vadim Zeitlin
e421922f90 MSW compilation fixes - widgets sample runs!
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 00:27:24 +00:00
Vadim Zeitlin
1e6feb95a7 first pass of wxUniv merge - nothing works, most parts don't even compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 20:59:19 +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
Vadim Zeitlin
55bd3f34b6 use screen resolution, not hard coded one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-13 14:43:23 +00:00
Vadim Zeitlin
789034a083 added checks to wxFont accessors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-15 19:30:53 +00:00
Vadim Zeitlin
09fcd88955 applied wxNativeFontInfo patch #103089
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-24 17:16:04 +00:00
Vadim Zeitlin
76e23cdba3 compilation fixes for wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-18 23:49:58 +00:00
Václav Slavík
f94dfb3897 applied (part of) Alexey Leko's patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-11-25 23:13:06 +00:00
Bryan Petty
3ca6a5f046 second merge of the 2.2 branch (RL)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-08-08 06:11:51 +00:00
Bryan Petty
f6bcfd974e merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
Julian Smart
7fee680be8 Some VC++ makefile fixes; minor comment mods to setup0.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-19 14:47:13 +00:00
Robin Dunn
fb04b3438d wxFont remembers facename of actual font used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-17 18:16:08 +00:00
Václav Slavík
ad81651f00 removed USE_SHARED_LIBRARY(IES)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-14 23:57:30 +00:00
Vadim Zeitlin
07cf98cb8e 1. undid my wrong fix to wxWindowBase::Centre
2. corrected fatal bug in wxCheckLstBox (double deletion of items)
3. wxTextCtrl::SetValue() only does it if the new text is different from
   the old one
4. wxBitmap(const wxIcon&) ctor added
5. compilation fixes for VC++ and generic Win32 implementation of
   wxGetCurrentTime() in timercmn.cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-13 00:30:45 +00:00
Vadim Zeitlin
11c7d5b6d1 1. wxFontMapper seems to work for wxMSW
2. font functions moved into a separate file, duplicated code in font.cpp
   and fontdlg.cpp removed
3. wxCustomDataObject docs finished


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-06 00:43:31 +00:00
Vadim Zeitlin
a1d58ddc15 wxFontEnumerator mostly works for wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-30 00:08:04 +00:00
Julian Smart
8fb3a512a8 Fixes for 16-bit compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-24 19:50:17 +00:00
Karsten Ballüder
223d09f6b5 replaced T() makro with wxT() due to namespace probs, _T() exists, too
fixed compilation problems, mainly in html code
compiles and links fine on Solaris, runs with samples and Mahogany


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-08 14:35:56 +00:00
Vadim Zeitlin
e90c1d2a19 many changes; major ones:
1. start of !wxUSE_GUI support
2. _T() macro renamed to T()
3. wxConvertWX2MB and MB2WX macro added


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-04 20:15:38 +00:00
Vadim Zeitlin
b9b3ccd9ea basic support for encodings for wxMSW::wxFont
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-01 00:49:52 +00:00
Vadim Zeitlin
74b31181b3 1. Implemented support for different icons for different states (expanded,
selected, combination of them) for the tree control (and doc'd it)
2. removed code which was sending extra event if wxFrame::SetSize() was
   used
3. important changes to wxWizard interface
4. small compilation corrections


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-09-29 22:47:56 +00:00
Vadim Zeitlin
0c5d3e1ccd 1. added a brief overview of Unicode support
2. added and documented wxBITMAP() macros (as wxICON)
3. restructured wxFont class, added support of encoding parameter
4. regenerated makefiles to compile the new fontcmn.cpp file
5. corrected bug with non existing files in document-view history


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-09-29 19:02:07 +00:00
Ove Kaaven
48a84964c6 Unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-07-23 09:52:33 +00:00
Ove Kaaven
837e57436a A few weeks of Unicode fixes (my old win95 laptop compiles sloowly,
especially when through the nullmodem cable).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-06-14 14:39:11 +00:00
Julian Smart
e90babdf85 Added progdlgg.cpp to makefiles; fixed true/false in treectrl.h; made IsFree
consistent (const omission)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-06-02 14:08:08 +00:00
Julian Smart
1f11220943 Consistent naming of e.g. wxUSE_CTRL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-02-02 12:37:14 +00:00
Unknown (UG)
a3b466481e no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-10-16 17:16:58 +00:00
Vadim Zeitlin
47d67540a0 USE_xxx constants renamed to wxUSE_xxx. This is an incompatible change, you
must recompile everything after upgrading!


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-09-25 13:28:52 +00:00
Julian Smart
34da0970a0 Fixed MSW printing, tidied up member variable names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-08-28 11:00:50 +00:00
Julian Smart
b823f5a145 Miscellaneous, mostly cosmetic changes. wxPen/wxFont/wxBrush altered so Set...
functions don't change shared objects.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-08-09 16:46:37 +00:00
Karsten Ballüder
2049ba38ad Changed __GTK__, __WINDOWS__ and __MOTIF__ to __WXGTK__, __WXMSW__ and __WXMOTIF__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-07-10 14:15:17 +00:00
Karsten Ballüder
b2aef89b7a Cleared up DEBUG define mess, defines are now called __WXDEBUG__ and WXDEBUG.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-07-10 11:14:17 +00:00
Julian Smart
debe6624c1 Sorry, I went and removed consts as per the style guide :-)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-07-04 15:17:59 +00:00
Karsten Ballüder
2bda0e1738 added some wxMSW stuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-05-20 14:12:05 +00:00