fixing warning and compile error against 10.4

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

diff --git a/include/wx/bmpcbox.h b/include/wx/bmpcbox.h
index 08b1f4638dd297cab5c870d21c9490a22f11d8b7..c0b753bebd376feebf65529911012b823e024b08 100644 (file)
--- a/include/wx/bmpcbox.h
+++ b/include/wx/bmpcbox.h
@@ -18,8 +18,8 @@
 #if wxUSE_BITMAPCOMBOBOX
 
 #include "wx/bitmap.h"
 #if wxUSE_BITMAPCOMBOBOX
 
 #include "wx/bitmap.h"

-#include "wx/window.h"

 
 

+class WXDLLIMPEXP_FWD_CORE wxWindow;

 class WXDLLIMPEXP_FWD_CORE wxItemContainer;
 
 // Define wxBITMAPCOMBOBOX_OWNERDRAWN_BASED for platforms which
 class WXDLLIMPEXP_FWD_CORE wxItemContainer;
 
 // Define wxBITMAPCOMBOBOX_OWNERDRAWN_BASED for platforms which


@@ -27,9 +27,11 @@ class WXDLLIMPEXP_FWD_CORE wxItemContainer;
 // (either native or generic).
 #if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)
     #define wxBITMAPCOMBOBOX_OWNERDRAWN_BASED
 // (either native or generic).
 #if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)
     #define wxBITMAPCOMBOBOX_OWNERDRAWN_BASED

+
+class WXDLLIMPEXP_FWD_CORE wxDC;

 #endif
 
 #endif
 

-extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxBitmapComboBoxNameStr[];
+extern WXDLLIMPEXP_DATA_ADV(const char) wxBitmapComboBoxNameStr[];

 
 
 class WXDLLIMPEXP_ADV wxBitmapComboBoxBase
 
 
 class WXDLLIMPEXP_ADV wxBitmapComboBoxBase