Applied patch [ 858324 ] Calling EndModal inside an EVT_INIT_DIALOG event handler

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

diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index d286d874f111653479f26d693d5574561a35297f..13cb2abf08bace0e2f19fb4c95fc28259e1f1e8d 100644 (file)
--- a/include/wx/ctrlsub.h
+++ b/include/wx/ctrlsub.h
@@ -31,7 +31,7 @@
 class WXDLLEXPORT wxItemContainer
 {
 public:
-    wxItemContainer() { m_clientDataItemsType = wxClientData_None; }
+    wxItemContainer();
     virtual ~wxItemContainer();
 
     // adding items
@@ -140,7 +140,7 @@ protected:
 class WXDLLEXPORT wxControlWithItems : public wxControl, public wxItemContainer
 {
 public:
-    wxControlWithItems() { }
+    wxControlWithItems();
     virtual ~wxControlWithItems();
 
     // we have to redefine these functions here to avoid ambiguities in classes
@@ -150,6 +150,10 @@ public:
     // this
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 
+    // usually the controls like list/combo boxes have their own background
+    // colour
+    virtual bool ShouldInheritColours() const { return false; }
+
 private:
     DECLARE_NO_COPY_CLASS(wxControlWithItems)
 };