Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. wxTimer::Start() returns bool in wxGTK too (other minor corrections

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
1998-10-12 13:09:15 +00:00
parent fbc535ff08
commit 03f38c58fd
23 changed files with 387 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/icon.h
View File

@@ -1,18 +1,26 @@
#ifndef _WX_ICON_H_BASE_
#define _WX_ICON_H_BASE_
// this is for Unix (i.e. now for anything other than MSW)
#undef wxICON
#define wxICON(icon_name) wxIcon(icon_name##_xpm)
#if defined(__WXMSW__)
#include "wx/msw/icon.h"
// under Windows, icon name is the ressource id (string)
#undef wxICON
#define wxICON(icon_name) wxIcon(#icon_name)
#include "wx/msw/icon.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/icon.h"
#include "wx/motif/icon.h"
#elif defined(__WXGTK__)
#include "wx/gtk/icon.h"
#include "wx/gtk/icon.h"
#elif defined(__WXQT__)
#include "wx/qt/icon.h"
#include "wx/qt/icon.h"
#elif defined(__WXMAC__)
#include "wx/mac/icon.h"
#include "wx/mac/icon.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/icon.h"
#include "wx/stubs/icon.h"
#endif
#endif