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
This commit is contained in:
parent
85ee3474b7
commit
47bc106012
18 changed files with 770 additions and 79 deletions
|
|
@ -1,15 +1,13 @@
|
|||
#ifndef _WX_ICON_H_BASE_
|
||||
#define _WX_ICON_H_BASE_
|
||||
|
||||
/* Commenting out since duplicated in gdicmn.h
|
||||
// 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__)
|
||||
// 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"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue