projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compilation warning fixed
[wxWidgets.git]
/
include
/
wx
/
choice.h
diff --git
a/include/wx/choice.h
b/include/wx/choice.h
index a8743fbb274cc4b3a7dc801380cc21f807fc3a80..a99e477cd2336edcdd55fa5b03ace9da31f353fb 100644
(file)
--- a/
include/wx/choice.h
+++ b/
include/wx/choice.h
@@
-20,6
+20,8
@@
#pragma interface "choicebase.h"
#endif
#pragma interface "choicebase.h"
#endif
+#if wxUSE_CHOICE
+
#include "wx/ctrlsub.h" // the base class
// ----------------------------------------------------------------------------
#include "wx/ctrlsub.h" // the base class
// ----------------------------------------------------------------------------
@@
-36,7
+38,7
@@
class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
{
public:
// all generic methods are in wxControlWithItems
{
public:
// all generic methods are in wxControlWithItems
-#ifdef __
WXMAC_X
__
+#ifdef __
DARWIN
__
virtual ~wxChoiceBase() {}
#endif
virtual ~wxChoiceBase() {}
#endif
@@
-77,5
+79,7
@@
public:
#include "wx/stubs/choice.h"
#endif
#include "wx/stubs/choice.h"
#endif
+#endif // wxUSE_CHOICE
+
#endif
// _WX_CHOICE_H_BASE_
#endif
// _WX_CHOICE_H_BASE_