Commit Graph

156 Commits

Author SHA1 Message Date
Paul Cornett
1e7121c776 Fix option to load image as HiDPI for GTK3
With GTK3, GetContentScaleFactor() does not return correct result until
TLW is realized, so use wxUpdateUIEvent to enable it later
2016-02-25 08:24:44 -08:00
Paul Cornett
11395c2e26 Add option to load image as HiDPI 2016-02-23 21:50:41 -08:00
Vadim Zeitlin
5066bff04e Fix harmless warning about shadowed variable in image sample
Don't redeclare a previously declared variable, just reuse the same one.
2016-01-31 01:53:01 +01: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
Paul Cornett
5b4a70247c use "new" wx-prefixed macros in samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-30 07:07:55 +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
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
Vadim Zeitlin
e3e7f6e573 Allow saving images under a different name in the image sample.
Also allow saving in XPM format.

See #13905.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-11 11:42:47 +00:00
Vadim Zeitlin
e709239889 Use wxHAS_IMAGES_IN_RESOURCES instead of explicit platform checks.
Add a special symbol which is defined only if the icons and other images (e.g.
cursor) are in the separate resource files and don't need to be embedded as
XPMs in the main program.

This makes the checks more clear and more customizable as it's enough to
change wxHAS_IMAGES_IN_RESOURCES definition instead of changing many platform
checks.

Closes #14050.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:28:58 +00:00
Dimitri Schoolwerth
2d143b6689 Removed ellipsis from "About..." occurrences.
MS and Apple guidelines mention ellipses should generally be used when a command needs additional information from the user before the operation can execute. This is not the case for showing an about dialog so the ellipses have been removed.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-20 16:51:09 +00:00
Vadim Zeitlin
b6963858fb Added wxIMAGE_OPTION_ORIGINAL_{WIDTH,HEIGHT} wxImage options.
These options allow to retrieve the original image size if the image was
scaled during load.

Closes #13662.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-14 13:35:48 +00:00
Vadim Zeitlin
fa378d369f Allow creating wxGraphicsFont without using wxFont.
This is mostly important to allow using wxImage-based wxGraphicsContext
without requiring X server connection under Unix: as wxFont can't be used
without X server, we needed another way to create wxGraphicsFont in this case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 22:07:29 +00:00
Vadim Zeitlin
0a470e5ea5 Allow creating wxGraphicsBitmap and wxGraphicsContext from wxImage.
Provide a way to use wxGraphicsContext to draw on wxImage.

This is implemented internally by drawing on wxGraphicsBitmap which can be now
also created from wxImage.

Add a test of the new functionality to the image sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 22:07:22 +00:00
Dimitri Schoolwerth
a1b806b982 Replaced Ok() occurrences with IsOk() throughout trunk.
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk().

Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 16:29:04 +00:00
Vadim Zeitlin
ccec90930c Add wxVersionInfo and functions returning it for 3rd party libraries.
Add simple wxVersionInfo class holding the version information.

Also add GetLibraryVersionInfo() static method to wx{JPEG,PNG,TIFF}Handler,
wxStyledTextCtrl and wxXmlDocument classes and wxGetZlibVersionInfo() and
wxGetLibraryVersionInfo() global functions using it.

Closes #12690.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-25 00:53:44 +00:00
Vadim Zeitlin
9ea83ebc7c Add test for a custom cursor to the image sample.
Load a cursor from PNG file to check that it appears as expected.

See #11989.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 11:49:05 +00:00
Vadim Zeitlin
526954c596 Globally use "wxWindows licence" consistently.
Use "wxWindows licence" and not "wxWidgets licence" (the latter doesn't
exist) and consistently spell "licence" using British spelling.

See #12165.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-13 13:29:13 +00:00
Vadim Zeitlin
f6b4a1b98d Don't use wxWindow::ClearBackground() in the image sample and explain why.
Painting on both wxPaintDC and wxClientDC simultaneously doesn't work well,
e.g. under Windows the client DC can be actually erased after we finished
painting the window contents, overwriting it.

Simply use wxDC::Clear() instead of wxWindow::ClearBackground() to avoid this
and document the danger of using ClearBackground() from EVT_PAINT handler.

Closes #10700.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-10 21:02:30 +00:00
Stefan Csomor
9b2f7ad513 reverting r57083 for OSX, fixes #11922
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-09 08:10:31 +00:00
Vadim Zeitlin
c8688139b0 Fix compilation of image sample with wxUSE_LIBPNG==0.
Also don't propose to save the file using the extensions not supported in this
library build.

Closes #11495.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-11-30 00:30:15 +00:00
Vadim Zeitlin
9a83f86094 Globally replace _T() with wxT().
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-23 20:30:22 +00:00
Vadim Zeitlin
f2a18fbec6 only allow selecting existing files in wxLoadFileSelector; use this function instead of wxFileSelector in the samples (closes #10693)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-12 18:02:57 +00:00
Vadim Zeitlin
a2bbedf07d added test for wxDC-based image scaling; updated copyright
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-05 14:53:17 +00:00
Vadim Zeitlin
437950ced1 paint background by default to avoid unexpected sample appearance
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-05 14:34:18 +00:00
Vadim Zeitlin
85fcb94fc9 implement GetImageCount() for GIF handler (closes #10663); added test for it to the sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-05 12:52:22 +00:00
Francesco Montorsi
41f02b9acc always call SetIcon() on the main frame of the sample; some small cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-08 01:01:00 +00:00
Francesco Montorsi
d19ce8c491 add some wxIMAGE_OPTION_PNG_xxx options to wxImage and wxPNGHandler to allow the user to set the desired compression level (closes #10372)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-14 17:54:38 +00:00
Francesco Montorsi
09ddabf738 no real change; just reorganize the sample splitting it in two source files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-14 17:41:21 +00:00
Francesco Montorsi
8b6264b43e add a 'Paint background' check menu item in the MyImageFrame class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-04 20:49:30 +00:00
Francesco Montorsi
3c5ab89b18 fix background repainting under wxMSW (not sure this is the best way to do it - but it works)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-02 22:53:38 +00:00
Vadim Zeitlin
95706ac162 ignore files produced by the sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-17 13:52:34 +00:00
Vadim Zeitlin
37ba70a520 added support for reading resolution information from TIFF, JPEG and BMP formats; corrected some bugs with saving resolution; added command allowing to see the image resolution (if available) to the sample (heavily modified patch 1790546)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-08 18:32:36 +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
Vadim Zeitlin
05a8831af2 added Roscale() test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-26 13:05:41 +00:00
Vadim Zeitlin
1d8acb7d4d added Rotate() test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-26 12:50:04 +00:00
Vadim Zeitlin
45e6e6f8ab call OnInit() from all samples to allow using standard command line options with all of them (patch 1623971)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-04 00:34:18 +00:00
Vadim Zeitlin
c66972ccc2 ask for BPP for .bmp extension, not .bpp one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-06 17:13:11 +00:00
Paul Cornett
adf45b5d48 remove unnecessary casts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-29 20:39:26 +00:00
Vadim Zeitlin
3af706cc31 added TGA handler (somewhat modified patch 1393912)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-29 18:58:25 +00:00
Włodzimierz Skiba
59185e297d Added test for scaling and bluring wxImage.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-16 13:22:13 +00:00
Robin Dunn
59b7a28003 pass useMask=true for the toucan images
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-23 02:35:06 +00:00
Robin Dunn
8ef089485c Show use use of both wxNativePixelData and wxAlphaPixelData
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-23 01:17:02 +00:00
Włodzimierz Skiba
9061c15cee Show grey version of image with alpha channel.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-07 16:59:33 +00:00
Włodzimierz Skiba
19bc15143a wxBLACK usage.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-07 13:26:00 +00:00
Vadim Zeitlin
ff3e84ffdc File/dir dialog styles and other changes (patch 1488371):
- check invalid combinations of styles in wxFileDialogBase::Create()
- use wxFD_XXX naming convention for wxFileDialog styles
- replaces wxDD_NEW_DIR_BUTTON with wxDD_DIR_MUST_EXIST
- removes #ifdef __WXGTK24__ / #endif blocks from wxGTK code
- removes wxFileDialogBase::Get/SetStyle and wxFileDialogBase::m_fileName
- renames wxDirDialogGTK to wxDirDialog


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-28 23:32:12 +00:00
Vadim Zeitlin
234fedd2d3 added support for CMYK JPEGs loading (patch 1476078)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-28 20:08:39 +00:00
Vadim Zeitlin
bd981f27c9 use wxBitmap objects instead of pointers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-28 20:00:56 +00:00
Vadim Zeitlin
66df4ec643 show effects of mirroring toucan image with alpha (modified part of patch 1469817)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 21:41:59 +00:00
Robert Roebling
6e5551ad85 Fix rawbitmap sample to clear bitmap first.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-29 15:44:21 +00:00
Włodzimierz Skiba
71307412f5 Missing wxUSE_... flags and source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-24 17:47:11 +00:00