Commit Graph

86 Commits

Author SHA1 Message Date
Stefan Csomor
5ac2e80ca2 making getter const
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-14 16:33:17 +00:00
Václav Slavík
38de94271f fixed incorrect handling of scaled fonts and fixed GetNativeFontInfo to return meaningful data with GTK1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-16 21:00:18 +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
Vadim Zeitlin
85c09802c0 don't change the font by reinitializing it to XLFD which was found to match it in GetInternalFont()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-15 23:29:19 +00:00
Vadim Zeitlin
a0af0d98b5 don't lose fonts underlined flag in ReInit() (bug fix for the change in rev. 1.76)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 14:09:36 +00:00
Robert Roebling
b6b579bd14 Give font 12pt size if none is given in pango string.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-20 22:30:17 +00:00
Vadim Zeitlin
3bf5a59b5e pointer returned by GetNativeFontInfo() is now const and must not be deleted (replaces patch 810192)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 01:23:37 +00:00
Václav Slavík
0aa1258a1b GTK2 compilation fix for Vadim's compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 19:24:59 +00:00
Vadim Zeitlin
395470d965 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-11 01:22:51 +00:00
Vadim Zeitlin
be5b2f9f38 initialize the font fields properly when it corresponds to a native font
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-11 01:14:34 +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
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
9045ad9dfc added DoSetNativeFontInfo() to avoid virtual function hiding
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-12 15:42:27 +00:00
Robert Roebling
464f1a1da6 Compile fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-31 14:45:38 +00:00
Robert Roebling
cfcc393212 Font work.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 12:40:45 +00:00
Robert Roebling
bbd006c0ce Removed usage of GetInternalFont() from GTK 2.0. This
also removes any usage of GdkFont. I left the actual
    deprecated method so that the change can be bckported
    without binary incompatible changes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-05 22:59:44 +00:00
Robin Dunn
cd9a673cd7 Ensure that the wxNativeFontInfo internal data is copied when the
wxFontRefData is.  This solves a wxGTK2 problem where the
PangoFontDescription pointer is copied by the default assignment
operator, in a binary compatible way .


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-04 03:51:13 +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
011ba5ed7e fixed restoring fonts from the native font info data which was completely broken somehow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-02 15:19:04 +00:00
Robert Roebling
a3c24e91eb Make wxTELETYPE and wxMODERN map to monospaced fonts.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-19 16:59:24 +00:00
Robert Roebling
a732ef9150 Same typo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-11 19:39:51 +00:00
Robert Roebling
f7c22a2874 Compile fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-06 19:14:44 +00:00
Robert Roebling
46eed000d6 Further code for Pango fonts (work now) and
some code for Pango prining. Doesn't work..


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-06 18:58:19 +00:00
Robert Roebling
db16cab461 Lots of work to set PangoFontDescription as the
native font info data. WIP.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-06 16:41:31 +00:00
Robert Roebling
fab591c5cc Lots of updates for Unicode and GTK 2.0 support.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-05 17:59:20 +00:00
Gilles Depeyrot
d84afea9d1 corrected warnings when compiling with -Wall -W
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-07 21:58:27 +00:00
Vadim Zeitlin
9e691f46b2 changes to make wxGTK compile with GTK+ 2.0: now it does but the minimal
sample crashes on startup


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-12 19:24:30 +00:00
Vadim Zeitlin
409d5a5860 better native font support for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-18 20:01:49 +00:00
Vadim Zeitlin
53f6aab752 added wxFont::IsFixedWidth(), documented it and implemented for wxGTK/Motif
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-14 19:04:35 +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
ab5fe83396 add more methods to wxNativeFontInfo: To/FromUserString and all the
accessor methods and implemented some of them


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-21 21:39:45 +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
Vadim Zeitlin
b1d1dc510d fixed (?) crashes because of default GUI font being deleted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-02 13:35:14 +00:00
Ove Kaaven
f967115097 Unicode compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-29 13:08:18 +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
dda88f5eee fix for a crash in ~wxFontList
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-19 13:52:57 +00:00
Vadim Zeitlin
7826e2dd83 wxNativeFontInfo changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-18 21:15:16 +00:00
Vadim Zeitlin
30764ab524 applied wxNativeFontInfo patch from Derry Bryson (with minor changes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-18 01:00:25 +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
Robert Roebling
d06b34a73e Highly experimental, unstable code (for determining the
encoding of the default GUI font). #ifdeffed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-19 10:31:26 +00:00
Vadim Zeitlin
a7987cc1a2 fix in fontspec parsing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-17 18:29:58 +00:00
Robert Roebling
e6527f9dd4 Removed crashes when not using themes.
Removed much flicker form tree ctrl and list ctrl.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-04 22:56:58 +00:00
Robert Roebling
c79853685d Correct deafult GUI font is now found when querying
wxSystemSetting. Hack.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-04 14:34:03 +00:00
Robert Roebling
7941ba111c Applied patch for multiple file selection, documented.
Fixed some compilation warnings,
  Minor change to OpenGL code.
  Documented wxImageHandler::GetImageCount() and related.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-01 14:08:42 +00:00
Robert Roebling
071a2d7814 Include changes again. Something is wrong with CVS...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-22 19:46:55 +00:00
Vadim Zeitlin
7beba2fc73 1. wxFontMapper almost finished
2. font helper functions are now in separate files, not utilsunx.cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-05 19:03:19 +00:00
Vadim Zeitlin
b02da6b187 many warnings fixed (from HP-UX compilation log)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-02 18:41:23 +00:00
Ove Kaaven
cb36238601 Someone forgot wxT()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-30 12:10:49 +00:00
Vadim Zeitlin
36f210c81e 1. added encoding param to wxFontEncoding::EnumFamilies() which allows to get
the list of families supporting the given encoding
2. added encoding decoding logic to src/gtk/font.cpp so that now choosing an
   encoding different from default in GTK+ font selector dialog actually works


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-29 17:54:13 +00:00