AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
61,545 Commits 1 Branch 0 Tags 297 MiB
675d9d779d
Commit Graph

94 Commits

Author SHA1 Message Date
Paul Cornett
f95fd11e08 Allow drawing HiDPI bitmaps with GTK3 
1. Override wxWindow::GetContentScaleFactor() to use gdk_window_get_scale_factor()
   when available, and to use correct scale (1.0) otherwise, as wxDC::GetPPI()
   (used by overridden method) is not properly implemented for wxGTK
2. Record scale in wxBitmap(wxImage&) ctor and wxBitmap::CreateScaled()
3. Adjust cairo scale for drawing bitmap, and (inversely) for drawing on bitmap
 2016-02-14 13:12:52 -08:00
JulianSmart
a797c9d956 Make wxBitmap ctors consistent wrt passing scale for conversion from wxImage; HiDPI adaptation for propgrid buffer and wxRTC images 2015-11-15 12:49:25 +00:00
Dimitri Schoolwerth
8f8d58d193 Use wx-prefixed macros throughout the repository. 
Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE
occurrences to use the wx-prefixed version of the macros.
 2015-04-23 22:00:35 +04:00
Vadim Zeitlin
118e8e7286 Add wxBitmap ctor from wxCursor to wxGTK and wxMSW. 
Allow converting wxCursor to wxBitmap in order to draw it, for example.

Closes #15699.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-09-04 19:44:52 +00:00
Paul Cornett
8b4ae731d3 use wxOVERRIDE 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-03-30 00:02:23 +00:00
Paul Cornett
e23af7f0e9 remove GetMaskBitmap() declaration, should have been part of r73409 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-16 17:23:29 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword. 
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-07-26 16:02:46 +00:00
Stefan Csomor
cfcab929d4 virtual method hiding in GTK, so add direct implementation 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-06-25 15:41:23 +00:00
Paul Cornett
5ca21fe7bf add wxMask::GetBitmap(), closes #9381 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-01-20 06:28:11 +00:00
Paul Cornett
9dc44eff02 support for GTK3 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-30 20:39:06 +00:00
Paul Cornett
54195d23c2 replace wxBitmap::SetPixbuf() with wxBitmap ctor taking pixbuf 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-03-25 23:33:18 +00:00
Paul Cornett
2d13e22fbf make wxMask pixmap member private 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-03-20 23:07:33 +00:00
Stefan Neis
6dd0883d55 Do not put semicolons after the definition of an inline function. 
Even though most compilers just ignore this, it's just wrong and if you
do get warnings about header files, they can become quite overwhelming.
Forward port of r70163.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-12-29 14:42:13 +00:00
Paul Cornett
29e461a210 remove unnecessary GTK declarations from defs.h, move things only used once to the place that needs them 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-09-07 16:56:50 +00:00
Vadim Zeitlin
27297c823a Implement wxMask copy ctor for wxGTK. 
Without copy ctor copying masks simply crashed because the same pointer was
deleted twice.

Also added a (completely trivial but better than nothing...) unit test for
wxBitmap to check that copying masks does work now.

Closes #11854.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-03-28 23:20:49 +00:00
Paul Cornett
06497cba66 defer creating bitmap representation until it is needed 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-01-07 18:16:45 +00:00
Paul Cornett
60a3d1c65b derive wxMask from wxMaskBase 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-10-17 20:06:34 +00:00
Vadim Zeitlin
03647350fc No changes, just removed hard tabs and trailing white space. 
This commit is huge but there are no non-white-space changes in it.

Some files containing third-party sources (src/msw/wince/time.cpp,
src/x11/pango*.cpp) were left unchanged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-08-21 10:41:26 +00:00
Francesco Montorsi
732d8c74f8 add wxSize overloads to wxBitmap ctors and to wxBitmap::Create 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-14 13:57:51 +00:00
Vadim Zeitlin
d3b9f782ef don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-19 13:55:27 +00:00
Paul Cornett
5852a1dcbb remove Rescale(), it is no longer used 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-04 02:42:03 +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
Francesco Montorsi
cbea3ec6ae introduced wxICON_DEFAULT_TYPE and wxBITMAP_DEFAULT_TYPE; documented these default argument values; matched the wxBitmap and wxIcon interfaces to their real implementations; revised icon.h interface header 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-09-21 20:03:14 +00:00
Francesco Montorsi
e86f2cc84a reorganized wxBitmap/wxBitmapHandler classes to use wxBitmapType instead of "long" where possible; made them const-correct; introduce wxBITMAP_SCREEN_DEPTH instead of -1 for clearness (specially in the docs); remove wxBitmapHandler empty stubs and rename wxBitmapHandlerBase as wxBitmapHandler 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-25 20:31:48 +00:00
Vadim Zeitlin
8f884a0dcc Fix Ok/IsOk() mess in wxGDIObject-derived classes; also added 
wxGDIObject::Create/CloneGDIRefData() and implemented them for (almost) all
ports


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-12-15 17:54:20 +00:00
Robert Roebling
ab171e9502 Converted wxGTK's basic DC classes to new DC code 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-09-23 11:27:41 +00:00
Vadim Zeitlin
c052164410 compilation fixes for wxUSE_IMAGE==0 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-07-11 00:02:11 +00:00
Václav Slavík
650c0aa918 cleanup of raw access to bitmaps: 
1. remove UseAlpha() on platforms that don't need it and call it automatically from ~wxPixelData instead of requiring explicit call; deprecate wxPixelData::UseAlpha()
2. don't call UngetRawData() if GetRawData() failed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-07-10 13:32:25 +00:00
Václav Slavík
b5dbe15d0b added WXDLLIMPEXP_FWD_FOO macros in addition to WXDLLIMPEXP_FOO for use with forward declarations (in preparation for GCC visibility support) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-07-09 10:09:52 +00:00
Stefan Neis
459f812bad Generalized compilation fix for old compilers. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-01 01:16:01 +00:00
Vadim Zeitlin
55ccdb93e4 COW cleanup patch (1583966): 
1. perform deep comparison for the classes for which it makes sense in the
   ports where this wasn't done yet
2. remove (shallow) comparison operators for the classes for which it does
   not make sense (such as wxBitmap)
3. makes wxBitmap use COW on all ports
4. adds wxObject::IsRefTo()
5. centralizes and improves COW docs


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-30 19:26:48 +00:00
Stefan Neis
4a4bf7eefb Compilation fix for old GCC versions. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-30 08:07:51 +00:00
Paul Cornett
4c44e0d048 correct access for virtuals 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-24 16:44:26 +00:00
Paul Cornett
e3e89a9370 implement {Create,Clone}RefData for gtk wxBitmap 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-17 03:19:20 +00:00
Vadim Zeitlin
b7cacb43db add IsOk() to all classes having Ok() method (patch 1570985) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-08 21:56:55 +00:00
Paul Cornett
452418c4b0 Move some things to wxBitmapBase to avoid much duplication. 
Use proper const for XPM data, and const void* for arbitary bitmap data.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-08 08:04:49 +00:00
Paul Cornett
2365667381 some cleanup, and plug a few small holes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-07 18:32:11 +00:00
Vadim Zeitlin
d3c7fc996a mark all dtors which are virtual because base class dtor is virtual explicitly virtual themselves 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-09-05 20:47:48 +00:00
Paul Cornett
0416c41834 header includes cleanup 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-30 05:55:56 +00:00
Paul Cornett
5ac1d44aa4 Combine two wxImage-to-pixmap creation functions into one. 
Use consistent method for creating mono bitmap in wxBitmap and wxMask.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-14 06:26:35 +00:00
Paul Cornett
b85229d15b remove redundant GdkBitmap representation from wxBitmap 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-19 18:30: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
bdbd4e9612 Nuke GTK1 from include/gtk 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-01-22 21:00:19 +00:00
Włodzimierz Skiba
0b04c4e0bd Missing wxUSE_PALETTE markup (#1369489). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-11-30 07:58:37 +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
Michael Wetherell
20123d4958 Add import/export attributes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-08-02 22:58:06 +00:00
Robert Roebling
0ff2a74d0c Implemented wxBitmap::HasAlpha() and ::UseAlpha(). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-02-15 20:27:46 +00:00
Vadim Zeitlin
d2400c3ff3 another compilation fix: added dummy UseAlpha(0 and HasAlpha() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-02-13 17:16:33 +00:00
Vadim Zeitlin
f383c5b89c compilation fix for raw bitmaps (can't include wx/rawbmp.h from wx/bitmap.h as the former includes the latter!) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-02-13 17:14:19 +00:00
Robert Roebling
284f2b59db Added raw bitmap access support to GTK 2.0. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-02-13 15:35:43 +00:00