X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/184b5d99a5382cd7a19888c85aff11f8a21af2f6..a6e2157322eedc8142be3a24cb3fe26eb1e8a0e8:/include/wx/resource.h diff --git a/include/wx/resource.h b/include/wx/resource.h index 0b0357e554..74fa153f01 100644 --- a/include/wx/resource.h +++ b/include/wx/resource.h @@ -6,7 +6,7 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_RESOURCEH__ @@ -42,16 +42,20 @@ #define wxDLG_POINT(x, y, parent, useDlgUnits) (useDlgUnits ? parent->ConvertDialogToPixel(wxPoint(x, y)) : wxPoint(x, y)) #define wxDLG_SIZE(x, y, parent, useDlgUnits) (useDlgUnits ? parent->ConvertDialogToPixel(wxSize(x, y)) : wxSize(x, y)) +#ifdef FindResource +#undef FindResource +#endif + /* * Internal format for control/panel item */ - + class WXDLLEXPORT wxItemResource: public wxObject { DECLARE_DYNAMIC_CLASS(wxItemResource) public: - + wxItemResource(); ~wxItemResource();