Commit Graph

46 Commits

Author SHA1 Message Date
Vadim Zeitlin
d65e9d5707 Move "static" keyword out from wxDEPRECATED() macros to placate icc.
Intel compiler gives warnings if the static keyword is not at the beginning of
the declaration and this happened when using it inside wxDEPRECATED() and
related macros because the declaration started with __declspec(deprecated) or
__attribute__((deprecated)) instead.

To avoid this problem, simply move "static" outside the macro.

Closes #12932.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-19 12:32:59 +00:00
Stefan Csomor
ca9eebc346 artmac extended for cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-26 16:15:39 +00:00
Vadim Zeitlin
2e9b5717cd Add wxUSE_ARTPROVIDER_STD build option.
Make it possible to exclude wxDefaultArtProvider from build. Now that a
Tango-based provider exists, it may make sense to disable the standard bitmaps
if the program doesn't need the few of them not provided by Tango anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 17:39:37 +00:00
Vadim Zeitlin
c1d2466a79 Add wxArtProvider using Tango icons.
The icons are embedded as PNG images directly in the source code to avoid the
need for installing them. This does make the library larger though so provide
a wxUSE_ARTPROVIDER_TANGO option to turn the new code and associated bloat off.
Also turn it off by default under wxGTK as the native art provider is used
there anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 17:39:25 +00:00
Vadim Zeitlin
a7cfad3ad6 Add go to first/last and plus/minus art provider icons.
These icons will be used in the upcoming new implementation of the print
preview frame and as they are also natively supported by GTK+ it makes sense
to have support for them in wx itself.

Notice that the existing bookmark add/remove icons are already mapped to the
icons which look like plus and minus signs respectively in wxGTK but we need
plus/minus in print preview in the other ports too so add these icons under
explicit names.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 17:39:01 +00:00
Vadim Zeitlin
19be42b760 Make art provider id of type "char *" instead of "wxChar *".
These strings don't need to be wide and, as elsewhere, prefer the
compatibility with 2.8 ANSI build to compatibility with Unicode build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 17:38:51 +00:00
Vadim Zeitlin
b9727751aa Added wxART_CLOSE art id.
This id corresponds to the close button bitmap. Currently only wxGTK returns a
natively-looking button from here, MSW and OS X versions will be added later.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-05 22:55:53 +00:00
Vadim Zeitlin
39f6b6ba78 Added wxArtProvider::GetMessageBoxIconId().
This function translates between wxICON_XXX constants and wxART_YYY values. It
was extracted from the existing GetMessageBoxIcon().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-05 22:55:46 +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
b5c2a33438 wxArtProvider::GetIconBundle() cleanup:
* makes GetIcon() and GetBitmap() behave in the same way again (i.e. GetBitmap
  falls back to CreateIconBundle too)
* GetIcon() used to call CreateIconBundle() first, before CreateBitmap() - this
  doesn't make sense, inverted
* GetIconBundle() falls back to GetIcon() if provider's CreateIconBundle()
  doesn't return anything and vice versa: GetIcon()/GetBitmap() falls back to
  GetIconBundle() if CreateBitmap() doesn't return anything


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-29 21:23:59 +00:00
Stefan Csomor
1d61c55432 turning on icons for osx-cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-08 18:24:07 +00:00
Jouk Jansen
e3c80a1dd9 gtk1.x has less native functions than gtk2.x
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-20 14:12:40 +00:00
Václav Slavík
a158acac6d Cleaned up wxArtProvider:
1. Move platform-specific code for both GetSizeHint() and GetBitmap()
   into platform-specific files.
2. Introduced GetNativeSizeHint() to make native sizes better accessible,
   without having to understand weird GetSizeHint() semantics.
3. Fixed GetNativeSizeHint() to return sensible values in non-GTK ports;
   it returns wxDefaultSize if it can't make a good guess instead of
   returning arbitrary value.
4. Use 16x16 icons on MSW instead of 16x15: it works and is more
   'natural' size.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-16 19:07:42 +00:00
Václav Slavík
14440cc658 small wxArtProvider API improvements: added HasNativeProvider() and renamed confusingly-named Insert() to PushBack()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-07 11:46:59 +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
1970409e33 added wxArtProvider::GetMessageBoxIcon() to avoid duplicating the same code in generic message and log dialogs (and soon notification message too)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-02 19:39:59 +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
Vadim Zeitlin
527343602e 1. changed wxIconBundle to use m_refData and COW to make copying icon bundles
fast (which was needed for 2)
2. make it possible to return wxIconBundles from wxArtProvider
3. implement Mac-specific wxArtProvider doing (2)

(modified patch 1581960)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-07 19:59:51 +00:00
Włodzimierz Skiba
ce7208d49d Minor header cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-30 11:56:12 +00:00
Vadim Zeitlin
571d2e0f23 1. deprecate redundantly sounding wxArtProvider::FooProvider() to just Foo()
2. wxArtProvider::Remove() now really only removes the provider without
   deleting it, Delete() does delete it
3. moreover, ~wxArtProvider removes the provider as well so there is almost
   no need to call Delete() explicitly any more


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-23 20:16:18 +00:00
Václav Slavík
1486fb5f10 fixed typo in previous commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-31 17:21:33 +00:00
Václav Slavík
dd7d379ebc added wxArtProvider::InsertProvider to accompany PushProvider
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-31 17:00:13 +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
Robin Dunn
406011a83d Some tweaks to the temporary art images, added wxART_NEW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-26 19:15:45 +00:00
Robert Roebling
e53a95bcb1 Applied patch for ArtProvider.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-12 10:33:00 +00:00
Robert Roebling
b737ad10de Applied John L's patches for curson scaling, image resizing
without scaling and the art provider resize bitmap patch.
    I'll look into adapting the generic file dialog to it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-04 18:33:57 +00:00
Vadim Zeitlin
50f65637a8 added more icons (for GTK only) (patch 1097684)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-19 16:56:13 +00:00
Robert Roebling
ddf6088b1e Added new Art which GTK+ 2.4 defines and
which we should use.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-27 23:23:47 +00:00
Włodzimierz Skiba
409ded0fc5 Unnecessary wxString(wxString).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 19:50:37 +00:00
Włodzimierz Skiba
4629016dfb Source cleaning: whitespaces, tabs, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-08 17:30:19 +00:00
Václav Slavík
b5cf8234c6 added wxART_BUTTON
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-22 18:56:55 +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
Václav Slavík
1202890513 added support for gcc precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 12:38:21 +00:00
Václav Slavík
cba5a276e4 added wxART_MISSING_IMAGE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-20 00:31:28 +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
Gilles Depeyrot
af49c4b8a2 disable use of #pragma interface under Mac OS X
GNU compiler included with Mac OS X 10.2 (Jaguar) as well as August Developer
Tools update contain a bug concerning #pragma interface handling that can only
be worked around by not using them (and they are not necessary anyways)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-31 11:29:13 +00:00
Václav Slavík
6ada5c3359 yet another variation on the same theme: wxMAKE_ART_ID_FROM_STR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-20 22:27:54 +00:00
Václav Slavík
4c2afb6fbc make it possible to easily define artID from a string (for XRC)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-17 22:24:34 +00:00
Václav Slavík
db70a2f20a define wxART_* constanst in way that will make adding XRC support easier
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-14 20:04:18 +00:00
Václav Slavík
a81c3c2383 make wxArtProvider pure virtual (I was not so on
a purpose in some early stage but I think that it is
relevant no more...)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-16 23:03:24 +00:00
Václav Slavík
0e04ef47f6 move wxApp::GetStdIcon to wxArtProvider
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-24 00:19:01 +00:00
Václav Slavík
00958db524 port proplist.cpp to wxArtProvider
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-22 23:22:02 +00:00
Václav Slavík
60d2cc2571 use wxArtProvider in wxFileDialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-22 19:20:41 +00:00
Václav Slavík
57b0987bb9 (hopefully) final touches to wxArtProvider
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-21 23:42:39 +00:00
Václav Slavík
2aca4a9886 added wxArtProvider
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-19 23:40:25 +00:00