AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
51,991 Commits 1 Branch 0 Tags 297 MiB
0ce0f1e9eb
Commit Graph

32 Commits

Author SHA1 Message Date
Vadim Zeitlin
e6777e6575 Add wx{Pen,Brush}::Is[Non]Transparent() methods and use them. 
Using GetStyle() == wx{PEN,BRUSH}STYLE_TRANSPARENT doesn't work for
uninitialized pen or brush objects so add convenient helpers which do work for
them.

Use the new helper functions everywhere instead of explicitly checking for
style. This makes the code shorter and more clear and also fixes some bugs (at
least those in GTK printing code).

Notice that this patch removes the main reason for explicitly initializing
m_pen and m_brush in wxGTKDCImpl ctor but this initialization still can't be
removed, at least for the latter, as doing this somehow breaks GetPixel(). It
would be nice to understand why and do remove this initialization so that a
newly created DC doesn't have any non-default pen nor brush.

Closes #12522.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-10-15 23:46:46 +00:00
Vadim Zeitlin
5c33522fca replace wx_{const,static,reinterpret}_cast with their standard C++ equivalents 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-11-02 02:39:52 +00:00
Vadim Zeitlin
bc735a68b1 declare future-deprecated SetStyle(int) in wxPen/Brush and not wxPen/BrushBase as it's useless there (compilation of user code doing pen.SetStyle(wxDOT) still fails) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-06-17 17:28:26 +00:00
Stefan Csomor
ef0e92205a fixing file paths after renaming 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-06-11 19:17:41 +00:00
Francesco Montorsi
231b9591aa add more pure virtuals to wxBrushBase; fix the GetColour() functions to return a wxColour object and not a reference; remove from docs the non-existent SetColour(const wxString&) overloads 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-28 16:47:58 +00:00
Francesco Montorsi
53a2db124c substitute WXDLLEXPORT with WXDLLIMPEXP_CORE and WXDLLEXPORT_DATA with WXDLLIMPEXP_DATA_CORE 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-26 15:06:00 +00:00
Vadim Zeitlin
1f2e566742 yet more compilation fixes after brush/pen style changes: remove trailing commas from enums 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-23 15:53:15 +00:00
Vadim Zeitlin
8907a7e2c0 add comparison operators for wxPen/BrushStyle and wxSOLID/... constants to avoid warnings in the existing code using such comparisons 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-22 03:13:18 +00:00
Vadim Zeitlin
b09cac4506 add compatible FindOrCreateBrush(wxColour, int) (also fixes wxMotif compilation) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-22 00:02:48 +00:00
Francesco Montorsi
ac3688c0d8 make the Pen/Brush code backward compatible as discussed on wx-dev; marked the blocks of code to deprecate in future with FUTURE_WXWIN_COMPATIBILITY_3_0; add wxCHECK_MSG in all ports to block Get*() calls on invalid objects (as already is for all other refcounted objects and for most ports) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-20 15:08:51 +00:00
Francesco Montorsi
9d7a8e4ab4 build fix (looking at buildbot) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-16 22:42:38 +00:00
Francesco Montorsi
82cddbd97a fix also wxPen to use wxPenStyle,wxPenJoin,wxPenCap enums instead of plain int; remove from wxBrushStyle the styles wxPen-specific; add backward-compatible ctor to wxPen; don't include brush.h and pen.h from gdicmn.h, rather move wxPenList,wxBrushList,wxFontList in the relative headers 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-16 21:11:12 +00:00
Francesco Montorsi
3e6858cdcb introduce wxBrushStyle enum and replace 'int style' occurrences in wxBrush code with 'wxBrushStyle style'; the change is backward compatible and documented in changes.txt 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-16 16:47:57 +00:00
Václav Slavík
b3c861501a initial (not yet working) code for DirectFB port 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-27 09:42:42 +00:00
Mart Raudsepp
1be7a35c5e Include gtk1 headers for non-gtk2. I don't really like this CPP logic, or more exactly __WXGTK__ without __WXGTK20__ 
being GTK1, oh well.
Might have missed some.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-01-23 03:27:34 +00:00
Julian Smart
99d800190a Added licence/copyright information 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-05-04 18:57:50 +00:00
Włodzimierz Skiba
4055ed8281 Use __WXPALMOS__ for PalmOS port which fits __WX$(TOOLKIT)__ of bakefiles. Do not depend on MSW macros in PalmOS port. Source cleaning. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-12-20 12:44:22 +00:00
Włodzimierz Skiba
c7dc771115 wxGDIObject is used earlier now so additional #include is required for those without PCH. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-12-03 17:31:53 +00:00
Włodzimierz Skiba
cb9d5bd07e wxBrushBase between wxBrush and wxGDIObject (class follows wxFontBase model). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-12-03 15:31:31 +00:00
Julian Smart
ffecfa5aeb Committed William Osborne's wxPalmOS port 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-10-19 13:40:30 +00:00
Vadim Zeitlin
5b36366c59 gave default parameters for wxBrush() ctor from wxColour (this is what is used in 99 of cases...) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-07-21 20:41:48 +00:00
David Elliott
e64df9bcc3 Include wxCocoa specific header 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-03-22 06:18:36 +00:00
Mattia Barbon
69c4481222 Use some wxX11 files (currently pen.cpp and brush.cpp) in wxMotif. 
Add src/x11 to VPATH in configure, and add a new flag to filelist.txt
indicating a file used in wxMotif but not in wxMotif directory.
  Modifed VMS makefiles, too (should be checked by someone with VMS,
though).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-02-20 18:20:47 +00:00
Mattia Barbon
e9e4acc519 Remove #ifdef __WXSTUBS__ from headers. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-01-04 09:22:53 +00:00
Julian Smart
83df96d63a Reformatted Motif headers; added __WXX11__ symbol support to common headers; 
added place-holding src/x11 and include/wx/x11 files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-02-05 16:34:33 +00:00
Vadim Zeitlin
6e711d5c09 applied patch 446836: removed qt headers 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-08-25 14:52:26 +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
David Webster
1777b9bbf4 *** empty log message *** 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-07-28 03:38:12 +00:00
Julian Smart
34138703c3 Changes mostly as a result of __WXSTUBS__ compilation. The stubs code now 
compiles under Windows with VC++. Also OGL enhancements espec. wxDrawnShape.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1998-08-15 00:23:28 +00:00
Robert Roebling
b4e76e0d7e More work on wxQt integration, configure 
I tried notr to break anything...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1998-08-07 20:23:17 +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
c801d85f15 Initial revision 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1998-05-20 14:01:55 +00:00