Rebake from clean wx tree.

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

diff --git a/include/wx/bmpcbox.h b/include/wx/bmpcbox.h
index 08b1f4638dd297cab5c870d21c9490a22f11d8b7..fb106136407d25ef7dfedcbd23f18042dad4691c 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


@@ -29,7 +29,7 @@ class WXDLLIMPEXP_FWD_CORE wxItemContainer;
     #define wxBITMAPCOMBOBOX_OWNERDRAWN_BASED
 #endif
 
     #define wxBITMAPCOMBOBOX_OWNERDRAWN_BASED
 #endif
 

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

 
 
 class WXDLLIMPEXP_ADV wxBitmapComboBoxBase
 
 
 class WXDLLIMPEXP_ADV wxBitmapComboBoxBase