removed WXWIN_COMPATIBILITY_2_4 in non-MSW code

[wxWidgets.git] / samples / widgets / odcombobox.cpp

diff --git a/samples/widgets/odcombobox.cpp b/samples/widgets/odcombobox.cpp
index 92823d895dd2ea68f98b32ea3e0041fd00795205..a20d439a43fd346410fe7a9e3062eae44c440c00 100644 (file)
--- a/samples/widgets/odcombobox.cpp
+++ b/samples/widgets/odcombobox.cpp
@@ -264,8 +264,7 @@ public:
 
         // If item is selected or even, or we are painting the
         // combo control itself, use the default rendering.
-        if ( GetVListBoxComboPopup()->IsCurrent((size_t)item) ||
-             (flags & wxODCB_PAINTING_CONTROL) ||
+        if ( (flags & (wxODCB_PAINTING_CONTROL|wxODCB_PAINTING_SELECTED)) ||
              (item & 1) == 0 )
         {
             wxOwnerDrawnComboBox::OnDrawBackground(dc,rect,item,flags);
@@ -465,8 +464,6 @@ void ODComboboxWidgetsPage::CreateContent()
     Reset();
 
     SetSizer(sizerTop);
-
-    sizerTop->Fit(this);
 }
 
 // ----------------------------------------------------------------------------