X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/243dbf1a5088be31980df51b97831b52cb6986cd..3ac7b44cc0765b8444324d71b58cf648009d41c2:/include/wx/motif/choice.h diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h index a0a51e42e3..1636502e63 100644 --- a/include/wx/motif/choice.h +++ b/include/wx/motif/choice.h @@ -12,16 +12,18 @@ #ifndef _WX_CHOICE_H_ #define _WX_CHOICE_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "choice.h" #endif -WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr; - #include "wx/clntdata.h" -#include "wx/dynarray.h" -WX_DEFINE_ARRAY(WXWidget, wxWidgetArray); +#ifndef wxWIDGET_ARRAY_DEFINED + #define wxWIDGET_ARRAY_DEFINED + + #include "wx/dynarray.h" + WX_DEFINE_ARRAY(WXWidget, wxWidgetArray); +#endif // Choice item class WXDLLEXPORT wxChoice: public wxChoiceBase