Improved selection mode handling in wxGrid::SelectBlock

[wxWidgets.git] / src / common / resource.cpp

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index b0945819f76b4dd35f9d187b77baebf90ff1cb89..27305db69a31288fbba2413d823b94238d90b495 100644 (file)
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -337,7 +337,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
           }
           if (bitmap.Ok())
            control = new wxBitmapButton(parent, id, bitmap, pos, size,
           }
           if (bitmap.Ok())
            control = new wxBitmapButton(parent, id, bitmap, pos, size,

-               childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
+               childResource->GetStyle() | wxBU_AUTODRAW, wxDefaultValidator, childResource->GetName());

         }
         else
           // Normal, text button
         }
         else
           // Normal, text button


@@ -544,7 +544,6 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
       // Force the layout algorithm since the size changes the layout
       if (control->IsKindOf(CLASSINFO(wxRadioBox)))
       {
       // Force the layout algorithm since the size changes the layout
       if (control->IsKindOf(CLASSINFO(wxRadioBox)))
       {

-        wxSize sz = control->GetSize();

         control->SetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT);
       }
 #endif
         control->SetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT);
       }
 #endif


@@ -2478,7 +2477,9 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
         return wxBitmap(name, bitmapType);
       }
     }
         return wxBitmap(name, bitmapType);
       }
     }

-    return wxNullBitmap;
+#ifndef __WXGTK__
+     return wxNullBitmap;
+#endif

   }
   else
   {
   }
   else
   {