Interface fixes for Phoenix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/interface/wx/odcombo.h b/interface/wx/odcombo.h
index 568079dc2263edadd33dfbe469c57a15716fe23e..07bb3a7501104b173ffac39eb1d5bf3789f09d2e 100644 (file)
--- a/interface/wx/odcombo.h
+++ b/interface/wx/odcombo.h
@@ -22,6 +22,27 @@ enum wxOwnerDrawnComboBoxPaintingFlags
     wxODCB_PAINTING_SELECTED        = 0x0002
 };
 
     wxODCB_PAINTING_SELECTED        = 0x0002
 };
 

+
+/**
+   New window styles for wxOwnerDrawnComboBox
+*/
+enum
+{
+    /**
+       Double-clicking cycles item if wxCB_READONLY is also used.
+    */
+    wxODCB_DCLICK_CYCLES            = wxCC_SPECIAL_DCLICK,
+
+    /**
+       If used, control itself is not custom paint using callback.
+       Even if this is not used, writable combo is never custom paint
+       until SetCustomPaintWidth is called
+    */
+    wxODCB_STD_CONTROL_PAINT        = 0x1000
+};
+
+
+

 /**
     @class wxOwnerDrawnComboBox
 
 /**
     @class wxOwnerDrawnComboBox
 


@@ -60,7 +81,7 @@ enum wxOwnerDrawnComboBoxPaintingFlags
 
     @see wxComboCtrl, wxComboBox, wxVListBox, wxCommandEvent
 */
 
     @see wxComboCtrl, wxComboBox, wxVListBox, wxCommandEvent
 */

-class wxOwnerDrawnComboBox : public wxComboCtrl
+class wxOwnerDrawnComboBox : public wxComboCtrl, wxItemContainer

 {
 public:
     /**
 {
 public:
     /**