Cured last focus bug (I hope); some wxMotif mods

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

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index f21e4ff954c70ae03a35324da9cf2aec1db9be21..6af2e7c60d888734f573b26d109ce0183b0d6459 100644 (file)
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -97,8 +97,8 @@ void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 
 bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 {
 
 bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 {

-    long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);

 #if defined(__WIN95__)
 #if defined(__WIN95__)

+    long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);

     if (style & BS_BITMAP)
     {
         // Should we call Default() here?
     if (style & BS_BITMAP)
     {
         // Should we call Default() here?


@@ -253,9 +253,17 @@ void wxBitmapButton::DrawButtonDisable( WXHDC dc, int left, int top, int right,
     if ( with_marg )
         ::PatBlt( (HDC) dc, left + m_marginX, top + m_marginY,
             right - 2 * m_marginX, bottom - 2 * m_marginY,
     if ( with_marg )
         ::PatBlt( (HDC) dc, left + m_marginX, top + m_marginY,
             right - 2 * m_marginX, bottom - 2 * m_marginY,

-                0xfa0089ul ) ;
-    else    ::PatBlt( (HDC) dc, left, top, right, bottom, 0xfa0089ul ) ;
-
+#ifdef __SALFORDC__
+                0xfa0089L ) ;
+#else
+                0xfa0089UL ) ;
+#endif
+    else    ::PatBlt( (HDC) dc, left, top, right, bottom,
+#ifdef __SALFORDC__
+       0xfa0089L ) ;
+#else
+       0xfa0089UL ) ;
+#endif

     ::SelectObject( (HDC) dc, old ) ;
 }
 
     ::SelectObject( (HDC) dc, old ) ;
 }