cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1d8729431c
wxWidgets/include/wx/icon.h

30 lines
686 B
C
Raw Normal View History

Changes mostly as a result of __WXSTUBS__ compilation. The stubs code now compiles under Windows with VC++. Also OGL enhancements espec. wxDrawnShape. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-08-14 20:23:28 -04:00
#ifndef _WX_ICON_H_BASE_
#define _WX_ICON_H_BASE_
Initial revision git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-05-20 10:01:55 -04:00
Misc. Motif; removed duplicate wxICON; variant compile fix; added wxString form of wxStripMenuCodes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-10-16 10:38:52 -04:00
/* Commenting out since duplicated in gdicmn.h
1. wxTimer::Start() returns bool in wxGTK too (other minor corrections to this class, such as "const" addition, Notify() is = 0 now...) 2. wxGTK::wxTextCtrl::Delete renamed to Clear for consistency 3. wx/wx_prec.h now includes wx/setup.h even if !wxUSE_PRECOMP because otherwise (recently added) tests "#if wxUSE_IOSTREAMH" donb't work. 4. Other compilation fixes for wxGTK (now it compiles again) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-10-12 09:09:15 -04:00
// this is for Unix (i.e. now for anything other than MSW)
#undef wxICON
#define wxICON(icon_name) wxIcon(icon_name##_xpm)
Misc. Motif; removed duplicate wxICON; variant compile fix; added wxString form of wxStripMenuCodes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-10-16 10:38:52 -04:00
*/
1. wxTimer::Start() returns bool in wxGTK too (other minor corrections to this class, such as "const" addition, Notify() is = 0 now...) 2. wxGTK::wxTextCtrl::Delete renamed to Clear for consistency 3. wx/wx_prec.h now includes wx/setup.h even if !wxUSE_PRECOMP because otherwise (recently added) tests "#if wxUSE_IOSTREAMH" donb't work. 4. Other compilation fixes for wxGTK (now it compiles again) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-10-12 09:09:15 -04:00
Changed __GTK__, __WINDOWS__ and __MOTIF__ to __WXGTK__, __WXMSW__ and __WXMOTIF__ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-07-10 10:15:17 -04:00
#if defined(__WXMSW__)
1. wxTimer::Start() returns bool in wxGTK too (other minor corrections to this class, such as "const" addition, Notify() is = 0 now...) 2. wxGTK::wxTextCtrl::Delete renamed to Clear for consistency 3. wx/wx_prec.h now includes wx/setup.h even if !wxUSE_PRECOMP because otherwise (recently added) tests "#if wxUSE_IOSTREAMH" donb't work. 4. Other compilation fixes for wxGTK (now it compiles again) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-10-12 09:09:15 -04:00
#include "wx/msw/icon.h"
Changed __GTK__, __WINDOWS__ and __MOTIF__ to __WXGTK__, __WXMSW__ and __WXMOTIF__ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-07-10 10:15:17 -04:00
#elif defined(__WXMOTIF__)
1. wxTimer::Start() returns bool in wxGTK too (other minor corrections to this class, such as "const" addition, Notify() is = 0 now...) 2. wxGTK::wxTextCtrl::Delete renamed to Clear for consistency 3. wx/wx_prec.h now includes wx/setup.h even if !wxUSE_PRECOMP because otherwise (recently added) tests "#if wxUSE_IOSTREAMH" donb't work. 4. Other compilation fixes for wxGTK (now it compiles again) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-10-12 09:09:15 -04:00
#include "wx/motif/icon.h"
Changed __GTK__, __WINDOWS__ and __MOTIF__ to __WXGTK__, __WXMSW__ and __WXMOTIF__ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-07-10 10:15:17 -04:00
#elif defined(__WXGTK__)
1. wxTimer::Start() returns bool in wxGTK too (other minor corrections to this class, such as "const" addition, Notify() is = 0 now...) 2. wxGTK::wxTextCtrl::Delete renamed to Clear for consistency 3. wx/wx_prec.h now includes wx/setup.h even if !wxUSE_PRECOMP because otherwise (recently added) tests "#if wxUSE_IOSTREAMH" donb't work. 4. Other compilation fixes for wxGTK (now it compiles again) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-10-12 09:09:15 -04:00
#include "wx/gtk/icon.h"
first pass of wxUniv merge - nothing works, most parts don't even compile git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 16:59:19 -04:00
#elif defined(__WXMGL__)
#include "wx/mgl/icon.h"
More work on wxQt integration, configure I tried notr to break anything... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-08-07 16:23:17 -04:00
#elif defined(__WXQT__)
1. wxTimer::Start() returns bool in wxGTK too (other minor corrections to this class, such as "const" addition, Notify() is = 0 now...) 2. wxGTK::wxTextCtrl::Delete renamed to Clear for consistency 3. wx/wx_prec.h now includes wx/setup.h even if !wxUSE_PRECOMP because otherwise (recently added) tests "#if wxUSE_IOSTREAMH" donb't work. 4. Other compilation fixes for wxGTK (now it compiles again) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-10-12 09:09:15 -04:00
#include "wx/qt/icon.h"
Changes mostly as a result of __WXSTUBS__ compilation. The stubs code now compiles under Windows with VC++. Also OGL enhancements espec. wxDrawnShape. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-08-14 20:23:28 -04:00
#elif defined(__WXMAC__)
1. wxTimer::Start() returns bool in wxGTK too (other minor corrections to this class, such as "const" addition, Notify() is = 0 now...) 2. wxGTK::wxTextCtrl::Delete renamed to Clear for consistency 3. wx/wx_prec.h now includes wx/setup.h even if !wxUSE_PRECOMP because otherwise (recently added) tests "#if wxUSE_IOSTREAMH" donb't work. 4. Other compilation fixes for wxGTK (now it compiles again) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-10-12 09:09:15 -04:00
#include "wx/mac/icon.h"
*** empty log message *** git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-07-27 23:38:12 -04:00
#elif defined(__WXPM__)
#include "wx/os2/icon.h"
Changes mostly as a result of __WXSTUBS__ compilation. The stubs code now compiles under Windows with VC++. Also OGL enhancements espec. wxDrawnShape. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-08-14 20:23:28 -04:00
#elif defined(__WXSTUBS__)
1. wxTimer::Start() returns bool in wxGTK too (other minor corrections to this class, such as "const" addition, Notify() is = 0 now...) 2. wxGTK::wxTextCtrl::Delete renamed to Clear for consistency 3. wx/wx_prec.h now includes wx/setup.h even if !wxUSE_PRECOMP because otherwise (recently added) tests "#if wxUSE_IOSTREAMH" donb't work. 4. Other compilation fixes for wxGTK (now it compiles again) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-10-12 09:09:15 -04:00
#include "wx/stubs/icon.h"
Initial revision git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-05-20 10:01:55 -04:00
#endif
#endif
Changes mostly as a result of __WXSTUBS__ compilation. The stubs code now compiles under Windows with VC++. Also OGL enhancements espec. wxDrawnShape. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-08-14 20:23:28 -04:00
// _WX_ICON_H_BASE_
Reference in New Issue Copy Permalink