Commit FM's GTK+ native assert dialog code.

[wxWidgets.git] / src / msw / ownerdrw.cpp

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 7711d8113e240060f6584f9370b8049229c43827..ffda6982b54a2d1c1969daea225b976828ff3188 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -24,13 +24,13 @@
     #include "wx/dcmemory.h"
     #include "wx/menu.h"
     #include "wx/utils.h"
     #include "wx/dcmemory.h"
     #include "wx/menu.h"
     #include "wx/utils.h"

+    #include "wx/settings.h"
+    #include "wx/menuitem.h"
+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/settings.h"

 #include "wx/ownerdrw.h"
 #include "wx/ownerdrw.h"

-#include "wx/menuitem.h"

 #include "wx/fontutil.h"
 #include "wx/fontutil.h"

-#include "wx/module.h"

 
 #if wxUSE_OWNER_DRAWN
 
 
 #if wxUSE_OWNER_DRAWN
 


@@ -429,7 +429,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
         if ( bmp.Ok() )
         {
             wxMemoryDC dcMem(&dc);
         if ( bmp.Ok() )
         {
             wxMemoryDC dcMem(&dc);

-            dcMem.SelectObject(bmp);
+            dcMem.SelectObjectAsSource(bmp);

 
             // center bitmap
             int nBmpWidth = bmp.GetWidth(),
 
             // center bitmap
             int nBmpWidth = bmp.GetWidth(),