X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5ab1fa8e6432cd95f93aad791d898f6a8243c530..bada28f00f12666ef31f0543cea2cde86b7935c7:/src/msw/bmpbuttn.cpp

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index 266adcd3d0..e5b40ea968 100644
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -23,6 +23,7 @@
 #ifndef WX_PRECOMP
     #include "wx/bmpbuttn.h"
     #include "wx/log.h"
+    #include "wx/dcmemory.h"
 #endif
 
 #include "wx/msw/private.h"
@@ -74,12 +75,25 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
   if ( height == -1 && bitmap.Ok())
     height = bitmap.GetHeight() + 2*m_marginY;
 
+	long msStyle = WS_VISIBLE | WS_TABSTOP | WS_CHILD | BS_OWNERDRAW ;
+
+#ifdef __WIN32__
+    if(m_windowStyle & wxBU_LEFT)
+        msStyle |= BS_LEFT;
+    if(m_windowStyle & wxBU_RIGHT)
+        msStyle |= BS_RIGHT;
+    if(m_windowStyle & wxBU_TOP)
+        msStyle |= BS_TOP;
+    if(m_windowStyle & wxBU_BOTTOM)
+        msStyle |= BS_BOTTOM;
+#endif
+
   m_hWnd = (WXHWND)CreateWindowEx
                    (
                     0,
                     wxT("BUTTON"),
                     wxT(""),
-                    WS_VISIBLE | WS_TABSTOP | WS_CHILD | BS_OWNERDRAW ,
+                    msStyle,
                     0, 0, 0, 0, 
                     GetWinHwnd(parent),
                     (HMENU)m_windowId,
@@ -102,6 +116,9 @@ void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
   m_buttonBitmap = bitmap;
 }
 
+// VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN
+#define FOCUS_MARGIN 3
+
 bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 {
 #if defined(__WIN95__)
@@ -115,12 +132,15 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 #endif
 
     LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item;
+    HDC hDC                = lpDIS->hDC;
+    UINT state             = lpDIS->itemState;
+    bool isSelected        = (state & ODS_SELECTED) != 0;
+    bool autoDraw          = (GetWindowStyleFlag() & wxBU_AUTODRAW) != 0;
+
 
-    // choose the bitmap to use depending on the buttons state
+    // choose the bitmap to use depending on the button state
     wxBitmap* bitmap;
 
-    UINT state = lpDIS->itemState;
-    bool isSelected = (state & ODS_SELECTED) != 0;
     if ( isSelected && m_buttonBitmapSelected.Ok() )
         bitmap = &m_buttonBitmapSelected;
     else if ((state & ODS_FOCUS) && m_buttonBitmapFocus.Ok())
@@ -133,29 +153,37 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     if ( !bitmap->Ok() )
         return FALSE;
 
-    // draw it on the memory DC
-    HDC hDC = lpDIS->hDC;
-    HDC memDC = ::CreateCompatibleDC(hDC);
+    // centre the bitmap in the control area
+    int x      = lpDIS->rcItem.left;
+    int y      = lpDIS->rcItem.top;
+    int width  = lpDIS->rcItem.right - x;
+    int height = lpDIS->rcItem.bottom - y;
+    int wBmp   = bitmap->GetWidth();
+    int hBmp   = bitmap->GetHeight();
+
+	int x1,y1;
+	
+    if(m_windowStyle & wxBU_LEFT)
+        x1 = x + (FOCUS_MARGIN+1);
+    else if(m_windowStyle & wxBU_RIGHT)
+        x1 = x + (width - wBmp) - (FOCUS_MARGIN+1);
+    else
+        x1 = x + (width - wBmp) / 2;
 
-    HBITMAP old = (HBITMAP) ::SelectObject(memDC, (HBITMAP) bitmap->GetHBITMAP());
+    if(m_windowStyle & wxBU_TOP)
+        y1 = y + (FOCUS_MARGIN+1);
+    else if(m_windowStyle & wxBU_BOTTOM)
+        y1 = y + (height - hBmp) - (FOCUS_MARGIN+1);
+    else
+        y1 = y + (height - hBmp) / 2;
 
-    if (!old)
+    if ( isSelected && autoDraw )
     {
-        wxLogLastError(_T("SelectObject"));
-
-        return FALSE;
+        x1++;
+        y1++;
     }
 
-    int x = lpDIS->rcItem.left;
-    int y = lpDIS->rcItem.top;
-    int width = lpDIS->rcItem.right - x;
-    int height = lpDIS->rcItem.bottom - y;
-
-    int wBmp = bitmap->GetWidth(),
-        hBmp = bitmap->GetHeight();
-
-    // Draw the face, if auto-drawing
-    bool autoDraw = (GetWindowStyleFlag() & wxBU_AUTODRAW) != 0;
+    // draw the face, if auto-drawing
     if ( autoDraw )
     {
         DrawFace((WXHDC) hDC,
@@ -164,62 +192,12 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
                  isSelected);
     }
 
-    // Centre the bitmap in the control area
-    int x1 = x + (width - wBmp) / 2;
-    int y1 = y + (height - hBmp) / 2;
-
-    if ( isSelected && autoDraw )
-    {
-        x1++;
-        y1++;
-    }
-
-    BOOL ok;
-
-    // no MaskBlt() under Win16
-#ifdef __WIN32__
-    wxMask *mask = bitmap->GetMask();
-    if ( mask )
-    {
-        // the fg ROP is applied for the pixels of the mask bitmap which are 1
-        // (for a wxMask this means that this is a non transparent pixel), the
-        // bg ROP is applied for all the others
-
-        HBRUSH hbrBackground =
-            ::CreateSolidBrush(wxColourToRGB(GetBackgroundColour()));
-        HBRUSH hbrOld = (HBRUSH)::SelectObject(hDC, hbrBackground);
-
-        ok = ::MaskBlt(
-                       hDC, x1, y1, wBmp, hBmp,                 // dst
-                       memDC, 0, 0,                             // src
-                       (HBITMAP)mask->GetMaskBitmap(), 0, 0,    // mask
-                       MAKEROP4(SRCCOPY,                        // fg ROP
-                                PATCOPY)                        // bg ROP
-                      );
-
-        ::SelectObject(hDC, hbrOld);
-        ::DeleteObject(hbrBackground);
-    }
-    else
-    {
-        // this will make the check below fail and BitBlt() will be used if
-        // MaskBlt() is not supported (for example, under Win95)
-        ok = FALSE;
-    }
-
-    if ( !ok )
-#endif // Win32
-    {
-        ok = ::BitBlt(hDC, x1, y1, wBmp, hBmp,  // dst
-                      memDC, 0, 0,              // src
-                      SRCCOPY);                 // ROP
-    }
-
-    if ( !ok )
-    {
-        wxLogLastError(_T("Mask/BitBlt()"));
-    }
-
+    // draw the bitmap
+    wxDC dst;
+    dst.SetHDC((WXHDC) hDC, FALSE);
+    dst.DrawBitmap(*bitmap, x1, y1, TRUE);
+    
+    // draw focus / disabled state, if auto-drawing
     if ( (state & ODS_DISABLED) && autoDraw )
     {
         DrawButtonDisable((WXHDC) hDC,
@@ -237,10 +215,6 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
                         isSelected);
     }
 
-    ::SelectObject(memDC, old);
-
-    ::DeleteDC(memDC);
-
     return TRUE;
 }
 
@@ -364,9 +338,6 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int botto
 #endif // defined(__WIN95__)
 
 
-// VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN
-#define FOCUS_MARGIN 3
-
 void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel )
 {
     RECT rect;