more backwards compatible kbd handling in wxScrolledWindow

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

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index 4cad610d43400cbd3dde84dcb9b71ebe8426ff13..2cee20c982d46c2aa4b7b2f8d6a4c7f8938395fd 100644 (file)
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -21,14 +21,13 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/bmpbuttn.h"
+    #include "wx/bmpbuttn.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/msw/private.h"
 
 #endif
 
 #include "wx/msw/private.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)

-#endif

 
 #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
 
 
 #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
 


@@ -40,7 +39,10 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 {
   m_buttonBitmap = bitmap;
   SetName(name);
 {
   m_buttonBitmap = bitmap;
   SetName(name);

+
+#if wxUSE_VALIDATORS

   SetValidator(validator);
   SetValidator(validator);

+#endif // wxUSE_VALIDATORS

 
   parent->AddChild(this);
 
 
   parent->AddChild(this);
 


@@ -75,8 +77,8 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
   m_hWnd = (WXHWND)CreateWindowEx
                    (
                     0,
   m_hWnd = (WXHWND)CreateWindowEx
                    (
                     0,

-                    _T("BUTTON"),
-                    _T(""),
+                    wxT("BUTTON"),
+                    wxT(""),

                     WS_VISIBLE | WS_TABSTOP | WS_CHILD | BS_OWNERDRAW ,
                     0, 0, 0, 0, 
                     GetWinHwnd(parent),
                     WS_VISIBLE | WS_TABSTOP | WS_CHILD | BS_OWNERDRAW ,
                     0, 0, 0, 0, 
                     GetWinHwnd(parent),


@@ -114,53 +116,120 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 
     LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item;
 
 
     LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item;
 

-    wxBitmap* bitmap = &m_buttonBitmap;
+    // choose the bitmap to use depending on the buttons state
+    wxBitmap* bitmap;

 
     UINT state = lpDIS->itemState;
 
     UINT state = lpDIS->itemState;

-    if ((state & ODS_SELECTED) && m_buttonBitmapSelected.Ok())
+    bool isSelected = (state & ODS_SELECTED) != 0;
+    if ( isSelected && m_buttonBitmapSelected.Ok() )

         bitmap = &m_buttonBitmapSelected;
     else if ((state & ODS_FOCUS) && m_buttonBitmapFocus.Ok())
         bitmap = &m_buttonBitmapFocus;
     else if ((state & ODS_DISABLED) && m_buttonBitmapDisabled.Ok())
         bitmap = &m_buttonBitmapDisabled;
         bitmap = &m_buttonBitmapSelected;
     else if ((state & ODS_FOCUS) && m_buttonBitmapFocus.Ok())
         bitmap = &m_buttonBitmapFocus;
     else if ((state & ODS_DISABLED) && m_buttonBitmapDisabled.Ok())
         bitmap = &m_buttonBitmapDisabled;

+    else
+        bitmap = &m_buttonBitmap;

 
     if ( !bitmap->Ok() )
         return FALSE;
 
 
     if ( !bitmap->Ok() )
         return FALSE;
 

+    // draw it on the memory DC

     HDC hDC = lpDIS->hDC;
     HDC memDC = ::CreateCompatibleDC(hDC);
 
     HBITMAP old = (HBITMAP) ::SelectObject(memDC, (HBITMAP) bitmap->GetHBITMAP());
 
     if (!old)
     HDC hDC = lpDIS->hDC;
     HDC memDC = ::CreateCompatibleDC(hDC);
 
     HBITMAP old = (HBITMAP) ::SelectObject(memDC, (HBITMAP) bitmap->GetHBITMAP());
 
     if (!old)

+    {
+        wxLogLastError(_T("SelectObject"));
+

         return FALSE;
         return FALSE;

+    }

 
     int x = lpDIS->rcItem.left;
     int y = lpDIS->rcItem.top;
     int width = lpDIS->rcItem.right - x;
     int height = lpDIS->rcItem.bottom - y;
 
 
     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
     // Draw the face, if auto-drawing

-    if ( GetWindowStyleFlag() & wxBU_AUTODRAW )
-        DrawFace((WXHDC) hDC, lpDIS->rcItem.left, lpDIS->rcItem.top, lpDIS->rcItem.right, lpDIS->rcItem.bottom,
-            ((state & ODS_SELECTED) == ODS_SELECTED));
+    bool autoDraw = (GetWindowStyleFlag() & wxBU_AUTODRAW) != 0;
+    if ( autoDraw )
+    {
+        DrawFace((WXHDC) hDC,
+                 lpDIS->rcItem.left, lpDIS->rcItem.top,
+                 lpDIS->rcItem.right, lpDIS->rcItem.bottom,
+                 isSelected);
+    }

 
     // Centre the bitmap in the control area
 
     // Centre the bitmap in the control area

-    int x1 = (int) (x + ((width - bitmap->GetWidth()) / 2));
-    int y1 = (int) (y + ((height - bitmap->GetHeight()) / 2));
+    int x1 = x + (width - wBmp) / 2;
+    int y1 = y + (height - hBmp) / 2;

 
 

-    if ( (state & ODS_SELECTED) && (GetWindowStyleFlag() & wxBU_AUTODRAW) )
+    if ( isSelected && autoDraw )

     {
     {

-        x1 ++;
-        y1 ++;
+        x1++;
+        y1++;

     }
 
     }
 

-    ::BitBlt(hDC, x1, y1, bitmap->GetWidth(), bitmap->GetHeight(), memDC, 0, 0, SRCCOPY);
+    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
+
+        wxColour colBg = GetBackgroundColour();
+        HBRUSH hbrBackground =
+            ::CreateSolidBrush(RGB(colBg.Red(), colBg.Green(), colBg.Blue()));
+        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
+#endif // Win32
+    {
+        ok = ::BitBlt(hDC, x1, y1, wBmp, hBmp,  // dst
+                      memDC, 0, 0,              // src
+                      SRCCOPY);                 // ROP
+    }
+
+    if ( !ok )
+    {
+        wxLogLastError(_T("Mask/BitBlt()"));
+    }

 
 

-    if ( (state & ODS_DISABLED) && (GetWindowStyleFlag() & wxBU_AUTODRAW) )
-        DrawButtonDisable( (WXHDC) hDC, lpDIS->rcItem.left, lpDIS->rcItem.top, lpDIS->rcItem.right, lpDIS->rcItem.bottom, TRUE ) ;
-    else if ( (state & ODS_FOCUS) && (GetWindowStyleFlag() & wxBU_AUTODRAW) )
-        DrawButtonFocus( (WXHDC) hDC, lpDIS->rcItem.left, lpDIS->rcItem.top, lpDIS->rcItem.right, lpDIS->rcItem.bottom, ((state & ODS_SELECTED) == ODS_SELECTED));
+    if ( (state & ODS_DISABLED) && autoDraw )
+    {
+        DrawButtonDisable((WXHDC) hDC,
+                          lpDIS->rcItem.left, lpDIS->rcItem.top,
+                          lpDIS->rcItem.right, lpDIS->rcItem.bottom,
+                          TRUE);
+    }
+    else if ( (state & ODS_FOCUS) && autoDraw )
+    {
+        DrawButtonFocus((WXHDC) hDC,
+                        lpDIS->rcItem.left,
+                        lpDIS->rcItem.top,
+                        lpDIS->rcItem.right,
+                        lpDIS->rcItem.bottom,
+                        isSelected);
+    }

 
     ::SelectObject(memDC, old);
 
 
     ::SelectObject(memDC, old);
 


@@ -171,14 +240,14 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 
 void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel )
 {
 
 void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel )
 {

-  HPEN  oldp;
-  HBRUSH    oldb ;
+    HPEN oldp;
+    HBRUSH oldb ;

 
 

-  HPEN penBorder;
-  HPEN penLight;
-  HPEN penShadow;
-  HBRUSH brushFace;
-  COLORREF ms_color;
+    HPEN penBorder;
+    HPEN penLight;
+    HPEN penShadow;
+    HBRUSH brushFace;
+    COLORREF ms_color;

 
     ms_color = GetSysColor(COLOR_WINDOWFRAME) ;
     penBorder = CreatePen(PS_SOLID,0,ms_color) ;
 
     ms_color = GetSysColor(COLOR_WINDOWFRAME) ;
     penBorder = CreatePen(PS_SOLID,0,ms_color) ;


@@ -196,10 +265,10 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int botto
     oldb = (HBRUSH) SelectObject( (HDC) dc, brushFace ) ;
     Rectangle( (HDC) dc, left, top, right, bottom ) ;
     SelectObject( (HDC) dc, penBorder) ;
     oldb = (HBRUSH) SelectObject( (HDC) dc, brushFace ) ;
     Rectangle( (HDC) dc, left, top, right, bottom ) ;
     SelectObject( (HDC) dc, penBorder) ;

-        MoveToEx((HDC) dc,left+1,top,NULL);LineTo((HDC) dc,right-1,top);
-        MoveToEx((HDC) dc,left,top+1,NULL);LineTo((HDC) dc,left,bottom-1);
-        MoveToEx((HDC) dc,left+1,bottom-1,NULL);LineTo((HDC) dc,right-1,bottom-1);
-        MoveToEx((HDC) dc,right-1,top+1,NULL);LineTo((HDC) dc,right-1,bottom-1);
+    MoveToEx((HDC) dc,left+1,top,NULL);LineTo((HDC) dc,right-1,top);
+    MoveToEx((HDC) dc,left,top+1,NULL);LineTo((HDC) dc,left,bottom-1);
+    MoveToEx((HDC) dc,left+1,bottom-1,NULL);LineTo((HDC) dc,right-1,bottom-1);
+    MoveToEx((HDC) dc,right-1,top+1,NULL);LineTo((HDC) dc,right-1,bottom-1);

 
     SelectObject( (HDC) dc, penShadow) ;
     if (sel)
 
     SelectObject( (HDC) dc, penShadow) ;
     if (sel)


@@ -226,13 +295,14 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int botto
     SelectObject((HDC) dc,oldp) ;
     SelectObject((HDC) dc,oldb) ;
 
     SelectObject((HDC) dc,oldp) ;
     SelectObject((HDC) dc,oldb) ;
 

-  DeleteObject(penBorder);
-  DeleteObject(penLight);
-  DeleteObject(penShadow);
-  DeleteObject(brushFace);
+    DeleteObject(penBorder);
+    DeleteObject(penLight);
+    DeleteObject(penShadow);
+    DeleteObject(brushFace);

 }
 
 }
 

-#define FOCUS_MARGIN 6
+// 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 )
 {
 
 void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel )
 {


@@ -252,20 +322,27 @@ void wxBitmapButton::DrawButtonDisable( WXHDC dc, int left, int top, int right,
 {
     HBRUSH  old = (HBRUSH) SelectObject( (HDC) dc, wxDisableButtonBrush ) ;
 
 {
     HBRUSH  old = (HBRUSH) SelectObject( (HDC) dc, wxDisableButtonBrush ) ;
 

-    if ( with_marg )
-        ::PatBlt( (HDC) dc, left + m_marginX, top + m_marginY,
-            right - 2 * m_marginX, bottom - 2 * m_marginY,
-#ifdef __SALFORDC__
-                0xfa0089L ) ;
-#else
-                0xfa0089UL ) ;
-#endif
-    else    ::PatBlt( (HDC) dc, left, top, right, bottom,
+    // VZ: what's this?? there is no such ROP AFAIK

 #ifdef __SALFORDC__
 #ifdef __SALFORDC__

-       0xfa0089L ) ;
+    DWORD dwRop = 0xFA0089L;

 #else
 #else

-       0xfa0089UL ) ;
+    DWORD dwRop = 0xFA0089UL;

 #endif
 #endif

+
+    if ( with_marg )
+    {
+        left += m_marginX;
+        top += m_marginY;
+        right -= 2 * m_marginX;
+        bottom -= 2 * m_marginY;
+    }
+
+    ::PatBlt( (HDC) dc, left, top, right, bottom, dwRop);
+

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

+void wxBitmapButton::SetDefault()
+{
+    wxButton::SetDefault();
+}