Motif compilation fixes (now ok)

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

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index e21e3af6ecef8fbdab718986a6d3abd4571251dc..26512aa0cd5460a5e01da7dbd269b946e2329a57 100644 (file)
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -1,13 +1,19 @@
-#ifndef __COMBOBOXH_BASE__
-#define __COMBOBOXH_BASE__
+#ifndef _WX_COMBOBOX_H_BASE_
+#define _WX_COMBOBOX_H_BASE_

 
 

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

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

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

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

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

 #endif
 
 #endif
 #endif
 
 #endif

-    // __COMBOBOXH_BASE__
+    // _WX_COMBOBOX_H_BASE_