Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,898 Commits 1 Branch 330 Tags
d5363c04ac7bfd5409b369746a67b83fd10cfdbc
Commit Graph

169 Commits

Author SHA1 Message Date
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
fc684792c6 Don't use implicit wxBitmapRefData copy ctor in wxGTK code. 
wxBitmapRefData didn't have a proper copy ctor but the code in wxGTK wxBitmap
implementation used it nevertheless and then manually patched the newly copied
object to avoid double pointer deletion and other unpleasantness.

Make the code more obviously correct by not using (nor providing) copy ctor at
all. There are no real changes otherwise.

See #12768.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-12-14 18:43:32 +00:00
Vadim Zeitlin
357f4c818d Fix harmless unused parameter warnings in minimal build. 
No real changes, just add some wxUnusedVar() to avoid warnings about
parameters unused in some non-default build configurations.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-11-10 13:52:17 +00:00
Vadim Zeitlin
ce00f59b5b No changes whatsoever, just remove trailing whitespace. 
There are no real changes in this commit but it removes all trailing white
space from our source files. This avoids problems when applying patches and
making diffs and it would be nice to prevent it from reappearing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-09-30 11:44:45 +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
8362e67ca7 for file load/save, always try wxImage first, fallback to pixbuf 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-01-08 18:19:23 +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
b2bf3ac658 remove never-implemented palette support 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-01-05 17:53:37 +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
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
Paul Cornett
ce7c8a9751 better fix for aCC and rawbmp.h 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-02-19 17:28:37 +00:00
Paul Cornett
8a614483c3 fix for HP aCC, it can't compile rawbmp.h 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-02-19 05:34:48 +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
Francesco Montorsi
3d37a9682b use IsOk() instead of Ok(); fix crash when loading invalid pixmaps/pixbufs 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-11 00:41:12 +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
Paul Cornett
150a349a4f fix for uninitialized alpha being used to create mask, fixes wxMemoryDC with 32-bit bitmaps 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-12-01 02:03:38 +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
Robert Roebling
4b230a33c5 Allow create of 24-bit bitmap, use Pixbuf when not a 24-bit visual 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-10-18 14:32:56 +00:00
Vadim Zeitlin
f3d7473941 add a scoped_ptr-like wxGtkObject class which calls g_object_unref() automatically and use it in some GC-related code 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-08-27 01:06:58 +00:00
Vadim Zeitlin
98d8a7ece5 honour user scale and source offset in wxDC::Blit() (#2605) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-08-27 00:52:13 +00:00
Vadim Zeitlin
c74fc1e130 add parentheses for && inside || to fix g++ 4.3 warning 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-08-25 14:39:48 +00:00
Paul Cornett
2a23042680 fix some warnings from GCC -Wextra 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-05-15 17:24:48 +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
Vadim Zeitlin
8d22935dcb unused parameter warning fixes for --disable-all-features build 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-11-11 12:55:43 +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
Paul Cornett
35d2f1b82e need to invert offsets for gdk_pixbuf_scale; 
remove unneccessary and incorrect optimization


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-05-16 07:14:53 +00:00
Paul Cornett
533b005afd speed up Rescale 5- to 15-fold by using pixbuf scaling 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-05-16 02:45: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
Paul Cornett
edba2de33e remove assert from PurgeOtherRepresentations,we'll have to trust that callers know what they're doing 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-17 05:50:10 +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
Paul Cornett
7002950658 make pixbuf/alpha handling more coherent in gtk wxBitmap, allow pixbuf without alpha 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-06 16:34:45 +00:00
Paul Cornett
5a67db4861 don't invert mono bitmaps in Rescale 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-06 15:49:29 +00:00
Paul Cornett
5ff14574fc some app.h cleanup: minimize includes, use static cast 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-09-09 17:29:19 +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
d0e7975501 set depth to 32 when creating pixbuf from wxImage with alpha; correct a few comments 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-25 06:27:34 +00:00
Robert Roebling
e1b1b6be56 Reenable inversion code again. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-24 09:35:06 +00:00
Paul Cornett
a7cfe08aff allow white as mask color when creating mask from mono bitmap 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-24 04:41:45 +00:00
Robert Roebling
ba938d0788 Comment out suspicious 1-bit bitmap conversion 
which happens to break wxAUI (its close button).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-23 20:01:34 +00:00
Robin Dunn
c7deb4ab80 Always create the pixmap with an alpha channel 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-23 01:18:27 +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
9be3f7558d wxBitmap does not need to use gdk_wx_draw_bitmap 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-13 05:56:27 +00:00
Paul Cornett
13785a4b8f more accurate mask creation for low color displays 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-13 05:12:18 +00:00
Paul Cornett
afbfbfdf2b use GDK to convert pixmap to RGB for wxImage 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-12 21:39:22 +00:00
Paul Cornett
4d1ebc8664 change deprecated gdk_image_get to gdk_drawable_get_image 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-11 17:34:54 +00:00
Paul Cornett
5588ce9276 code simplification and minor cleanup 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-11 05:14:19 +00:00