Added progdlgg.cpp to makefiles; fixed true/false in treectrl.h; made IsFree

[wxWidgets.git] / include / wx / choice.h

diff --git a/include/wx/choice.h b/include/wx/choice.h
index 5a421268ed8617bf01e0cf3a4d6360ae921b01ff..1830d779aa2a6456505d1cdaeed2b3eac4001eed 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -1,13 +1,19 @@
-#ifndef __CHOICEH_BASE__
-#define __CHOICEH_BASE__
+#ifndef _WX_CHOICE_H_BASE_
+#define _WX_CHOICE_H_BASE_

 
 

-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)

 #include "wx/msw/choice.h"
 #include "wx/msw/choice.h"

-#elif defined(__MOTIF__)
-#include "wx/xt/choice.h"
-#elif defined(__GTK__)
+#elif defined(__WXMOTIF__)
+#include "wx/motif/choice.h"
+#elif defined(__WXGTK__)

 #include "wx/gtk/choice.h"
 #include "wx/gtk/choice.h"

+#elif defined(__WXQT__)
+#include "wx/qt/choice.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/choice.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/choice.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __CHOICEH_BASE__
+    // _WX_CHOICE_H_BASE_