update from Marco Cavallini

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

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index 6255f13225651af711bf9fcb2e0ba08666fbdd89..e914de482e985be7116d02953ce1620711da59ec 100644 (file)
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     24.12.00
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     24.12.00
 // RCS-ID:      $Id$

-// Copyright:   (c) 1996-2000 wxWindows team
+// Copyright:   (c) 1996-2000 wxWidgets team

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -59,14 +59,12 @@ public:
     #include "wx/motif/combobox.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/combobox.h"
     #include "wx/motif/combobox.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/combobox.h"

-#elif defined(__WXQT__)
-    #include "wx/qt/combobox.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/combobox.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/combobox.h"

+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/combobox.h"

 #elif defined(__WXPM__)
     #include "wx/os2/combobox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/combobox.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/combobox.h"

 #endif
 
 #endif // wxUSE_COMBOBOX
 #endif
 
 #endif // wxUSE_COMBOBOX