Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,733 Commits 1 Branch 330 Tags
b65ce02c69b0381694309f976ab47bd18d75d6f3
Commit Graph

107 Commits

Author SHA1 Message Date
Václav Slavík
68c957045a don't expose M_FONTDATA in public header 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-20 16:21:08 +00:00
Václav Slavík
873fd4af5f don't expose M_FONTDATA in public header 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-20 16:14:01 +00:00
Paul Cornett
fd7a7443bc use common AllocExclusive, rather than custom code 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-17 04:20:47 +00:00
Vadim Zeitlin
177df6c5f6 wxUSE_PANGO is always 1 for wxGTK2 so there is no need to use #if wxUSE_PANGO in GTK2-only code 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-07-16 20:00:42 +00:00
Włodzimierz Skiba
dd05139a80 Include wx/gdicmn.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-19 20:18:46 +00:00
Vadim Zeitlin
85ab460e7d miscellaneous wxFont enhancements (patch 1496606): 
- made SetFaceName() bool and return false if the face name is not available
- corrected To/FromUserString() to complement each other


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-29 00:03:36 +00:00
Włodzimierz Skiba
ce5d92e150 Include wx/cmndata.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-25 21:08:11 +00:00
Włodzimierz Skiba
9eddec696f Include wx/settings.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-24 07:16:32 +00:00
Włodzimierz Skiba
de6185e212 Include wx/utils.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-02 10:39:23 +00:00
Włodzimierz Skiba
e4db172a3b Include wx/log.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-26 08:21:31 +00:00
Vadim Zeitlin
5f11fef543 use the encoding of the font which is used to draw the text when convering it to UTF-8 in wxGTK_CONV; the old wxGTK_CONV renamed to wxGTK_CONV_SYS (uses system encoding) and used in the contexts where no font is available 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-10 22:22:13 +00:00
Vadim Zeitlin
f8855e4725 great copy ctor/assignment operators cleanup by Paul Cornett (patch 1307665) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-02-09 00:51:23 +00:00
Mart Raudsepp
68567a967b Nuke GTK1 from src/gtk 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-01-22 20:29:17 +00:00
Mart Raudsepp
8907154c1a Nuke #pragma implementation/interface's 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-09-23 12:56:45 +00:00
Mart Raudsepp
d332c51456 [wxGTK2] Don't duplicate code inside wxFontRefData::InitFromNative() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-08-24 00:25:19 +00:00
Mart Raudsepp
8a15e8ba7a [wxGTK2] Move wxFontRefData::SetPointSize to wxNativeFontInfo. Implement SetFaceName() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-08-23 00:03:27 +00:00
Mart Raudsepp
7533ba252b [wxGTK2] Move wxFontRefData::SetStyle/SetWeight to wxNativeFontInfo 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-08-22 23:56:01 +00:00
Mart Raudsepp
8c8c4b717a [wxGTK2] Don't query native font for underlined, but return the set value - storing it natively would likely require 
the usage of a PangoAttribute, and I'm not sure if that's even different than just storing it inside wxFontRefData.
Not investigating further as PangoAttribute addition would require ABI compatibility breakage anyhow.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-08-22 23:27:39 +00:00
Mart Raudsepp
b67d14bee0 [wxGTK2] Do what we (I) can wrt the win32 centric wxNativeFontInfo::GetFamily 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-08-22 23:19:57 +00:00
Mart Raudsepp
02d9204cad [wxGTK2] wxFont::Get* - Query native font for information, if the wxFont has an associated wxNativeFontInfo 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-08-22 17:22:44 +00:00
Robert Roebling
0f6858b69e Apply Mart R.'s patch for improved font width 
handling and minor doc corrections.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-04-13 13:53:19 +00:00
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