make wxSetEnv compatible with ANSI and Unicode, deprecate passing NULL to it in favou...

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

diff --git a/include/wx/generic/bmpcbox.h b/include/wx/generic/bmpcbox.h
index 263cfbe02c3aaf5aa4c56217cf136f9ed9253e34..58f53627de4f6a8c031e9da637af74f36e8bf76c 100644 (file)
--- a/include/wx/generic/bmpcbox.h
+++ b/include/wx/generic/bmpcbox.h
@@ -4,7 +4,7 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Aug-30-2006
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,13 +15,8 @@
 
 #define wxGENERIC_BITMAPCOMBOBOX     1
 
-#if !wxUSE_ODCOMBOBOX
-    #error "Generic wxBitmapComboBox depends on wxOwnerDrawnComboBox"
-#endif
-
 #include "wx/odcombo.h"
 
-
 // ----------------------------------------------------------------------------
 // wxBitmapComboBox: a wxComboBox that allows images to be shown
 // in front of string items.
@@ -143,7 +138,7 @@ protected:
     virtual wxSize DoGetBestSize() const;
 
     // Event handlers
-    void OnResize(wxSizeEvent& event);
+    void OnSize(wxSizeEvent& event);
 
     // Recalculates amount of empty space needed in front of
     // text in control itself.
@@ -172,6 +167,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxBitmapComboBox)
 };
 
-
-#endif
-    // _WX_GENERIC_BMPCBOX_H_
+#endif // _WX_GENERIC_BMPCBOX_H_