Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,544 Commits 1 Branch 330 Tags
973abcbb6acfbc5985191ff655c233a80c98754e
Commit Graph

65 Commits

Author SHA1 Message Date
Vadim Zeitlin
973abcbb6a Add wxIcon::CreateFromHICON() to wxMSW. 
Provide a public method properly assigning an HICON to wxIcon, instead of
asking people to call SetHICON() and SetSize().

Closes #15023.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-02-10 16:13:37 +00:00
Vadim Zeitlin
c3f641cb5e Add wxBITMAP_PNG() macro similar to wxBITMAP() but for PNG images. 
Just as wxBITMAP() provides a portable way of loading bitmaps from either
Windows BMP resources or embedded XPM data depending on the platform,
wxBITMAP_PNG() hides the difference between loading bitmaps from PNG resources
under Windows and embedded PNG data elsewhere.

Also add wxBITMAP_PNG_FROM_DATA() macro which always loads PNG data from
memory: it's needed anyhow as part of wxBITMAP_PNG() implementation and some
people may prefer to always use it under all platforms.

Finally modify the image sample to demonstrate loading PNG images from both
resources and memory. This involved creation of a new Windows .rc file for it
and copying its data files to Resources bundle directory under OS X.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-09-13 17:15:25 +00:00
Vadim Zeitlin
017dc06b50 Use wxString::t_str() in calls to Windows API functions in wxMSW. 
Use t_str() instead of wx_str() to make the code work correctly in UTF-8 build
in which wx_str() returns a pointer to UTF-8 buffer while we need a wchar_t
pointer for Windows.

Closes #14371.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-03 19:16:59 +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
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
Václav Slavík
fde87a8276 no need to iterate over all special icon names after a match was found, there won't be another one 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-10-15 18:49:47 +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
Václav Slavík
e0a050e347 more changes to make wx compile without implicit wxString->char* conversion (for STL build) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-06-20 07:44:45 +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
Vadim Zeitlin
ab3d29eaab don't call ::GetSystemMetrics() unnecessarily in wxGetHiconSize() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-09-10 22:43:14 +00:00
Paul Cornett
286b8de534 remove Win32S-specific code 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-17 18:48:03 +00:00
Włodzimierz Skiba
0bca037363 Include wx/bitmap.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-14 10:02:19 +00:00
Włodzimierz Skiba
670f993563 Include wx/app.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-28 12:44:37 +00:00
Vadim Zeitlin
259c43f679 more extra semicolons removed (patch 1303724) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-09-25 11:16:57 +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
Włodzimierz Skiba
0c0d1521c0 Helpers in disabling warnings for unused params. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-07-01 13:39:03 +00:00
Vadim Zeitlin
795c9ab863 fixed wrong use of = instead of == (patch 1159289) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-03-08 20:13:58 +00:00
Vadim Zeitlin
a91bcd3b54 removed wxLoadBitmap() introduced in 1.37 -> 1.38; just use DIBs under Windows CE as well, we surely shouldn't duplicate system functions _especially_ on a platform with limited resources such as CE 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-02-20 12:07:25 +00:00
Włodzimierz Skiba
4dca492943 Warning fix. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-11-16 13:52:47 +00:00
Vadim Zeitlin
30984deafc new set of fixes for problems due to huge files support: drop wxFileSize_t, use wxFileOffset only, make wxInvalidOffset an int (main part of the patch 1063498) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-11-10 21:02:58 +00:00
Włodzimierz Skiba
213ceb3f0e Source cleaning: whitespaces & tabs, ::, TRUE/true, FALSE/false. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-08-26 08:46:18 +00:00
Włodzimierz Skiba
17a6a2e097 WinCE warning fixes. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-08-03 08:24:04 +00:00
Włodzimierz Skiba
7010702f63 WinCE fixes. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-07-20 11:11:46 +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
999836aaca warning fixes for BCC and OW (heavily modified patch 819146) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-10-16 10:28:15 +00:00
Vadim Zeitlin
9542f0a109 treat 0xc0c0c0 as transparent colour by default 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-09-30 12:26:42 +00:00
Julian Smart
419430a0c0 WinCE bitmap patch from Johannes Schindelin <Johannes.Schindelin@gmx.de> 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-09-15 08:55:19 +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
4676948b68 More WinCE mods 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-07-11 21:50:07 +00:00
Mattia Barbon
222ed1d678 STL-ification patch for wxMSW and wxGTK. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-07-10 19:55:12 +00:00
Chris Elliott
05d3cd45e5 update for digital mars - resolve externals in shell and winsock libs 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-05-07 13:18:45 +00:00
Chris Elliott
4ce1efe123 update to make digitalmars compile 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-04-19 18:15:17 +00:00
Vadim Zeitlin
2b254edf9c added wxDIB::Save() and wxDIB to/from wxBitmap) conversions, use them instead of the old C functions (the latter were removed, there is no old code left any more) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-03-23 21:33:21 +00:00
Vadim Zeitlin
474df21877 use wxDIB methods instead of old functions for working with DIBs 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-03-23 01:49:19 +00:00
Julian Smart
1cfa5d8e39 Some code tidying; removing dibutils.cpp which 
doesn't seem to be used any more


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-03-18 15:08:21 +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
d162a7ee7d removed warnings about using the deprecated functions and replaced untyped 
wxLists with the type safe equivalents (patch 668204 from Dimitri)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-01-25 12:28:51 +00:00
Ron Lee
4f8090e092 Update list operators, s/TRUE/true/ etc. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-01-25 04:35:21 +00:00
Vadim Zeitlin
8bbbae215c made wxBitmapRefData private (actually, this also fixes some bug so it's not absolutely gratitious, but I already closed the bug not knowing that my cvs checkin was going to timeout and die and don't remember any more what it was...) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-01-22 17:43:02 +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
Robin Dunn
d8f3f98359 Use the iconIndex in the default case too. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-09-05 19:38:13 +00:00
Robin Dunn
6bad4c327c Icons fetched from wxMimeTypesManager did not get the width/height of 
the icon, now they do.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-07-15 18:29:52 +00:00
Václav Slavík
c2edb18a7d change wxICON_INFO to wxICON_INFORMATION in Mac and MSW wxIcon code to be consistent with the constants 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-03-24 00:22:40 +00:00
Vadim Zeitlin
9990cb50e4 undid my fix for loading 16x16 icons which results in ugly results when loaing 32x32 ones because LoadImage() scales them badly 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-02-14 22:05:14 +00:00
Vadim Zeitlin
fea2b62e8e fixed loading the icons with non default size 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-02-13 00:31:29 +00:00
Vadim Zeitlin
621b3e2127 IMPLEMENT_DYNAMIC_CLASS fixes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-02-06 01:42:02 +00:00
Vadim Zeitlin
d275c7eb84 added wxUSE_PALETTE and fixed compilation with it set to 0 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-09-30 22:06:39 +00:00
Vadim Zeitlin
9cb9fdb372 fixed bug with loading standard icons 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-08-15 14:54:56 +00:00
Vadim Zeitlin
2dace059ee use Windows standard icons instead of our own (patch 443856) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-07-23 18:06:13 +00:00