keeping classnames in synch for xti

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

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index 22234319d36dddb081069bc52af99a22a38148bd..c249267f04bc8d1e1fd9daf5d2f40639c98fab2d 100644 (file)
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bmpbuttn.cpp
+// Name:        src/msw/bmpbuttn.cpp

 // Purpose:     wxBitmapButton
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     wxBitmapButton
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -17,12 +17,15 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_BMPBUTTON
+

 #ifndef WX_PRECOMP
     #include "wx/bmpbuttn.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/bmpbuttn.h"
     #include "wx/log.h"

+    #include "wx/dcmemory.h"

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


@@ -37,17 +40,18 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

-  m_buttonBitmap = bitmap;
+  m_bmpNormal = bitmap;

   SetName(name);
   SetName(name);

+
+#if wxUSE_VALIDATORS

   SetValidator(validator);
   SetValidator(validator);

+#endif // wxUSE_VALIDATORS

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

-  m_backgroundColour = parent->GetBackgroundColour() ;
-  m_foregroundColour = parent->GetForegroundColour() ;
+  m_backgroundColour = parent->GetBackgroundColour();
+  m_foregroundColour = parent->GetForegroundColour();

   m_windowStyle = style;
   m_windowStyle = style;

-  m_marginX = 0;
-  m_marginY = 0;

 
   if ( style & wxBU_AUTODRAW )
   {
 
   if ( style & wxBU_AUTODRAW )
   {


@@ -71,13 +75,29 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
   if ( height == -1 && bitmap.Ok())
     height = bitmap.GetHeight() + 2*m_marginY;
 
   if ( height == -1 && bitmap.Ok())
     height = bitmap.GetHeight() + 2*m_marginY;
 

+       long msStyle = WS_VISIBLE | WS_TABSTOP | WS_CHILD | BS_OWNERDRAW ;
+
+    if ( m_windowStyle & wxCLIP_SIBLINGS )
+        msStyle |= WS_CLIPSIBLINGS;
+
+#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"),
   m_hWnd = (WXHWND)CreateWindowEx
                    (
                     0,
                     wxT("BUTTON"),

-                    wxT(""),
-                    WS_VISIBLE | WS_TABSTOP | WS_CHILD | BS_OWNERDRAW ,
-                    0, 0, 0, 0, 
+                    wxEmptyString,
+                    msStyle,
+                    0, 0, 0, 0,

                     GetWinHwnd(parent),
                     (HMENU)m_windowId,
                     wxGetInstance(),
                     GetWinHwnd(parent),
                     (HMENU)m_windowId,
                     wxGetInstance(),


@@ -87,21 +107,19 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
   // Subclass again for purposes of dialog editing mode
   SubclassWin(m_hWnd);
 
   // Subclass again for purposes of dialog editing mode
   SubclassWin(m_hWnd);
 

-  SetFont(parent->GetFont()) ;
+  SetFont(parent->GetFont());

 
   SetSize(x, y, width, height);
 
   return TRUE;
 }
 
 
   SetSize(x, y, width, height);
 
   return TRUE;
 }
 

-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)
 {
 
 bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 {

-#if defined(__WIN95__)
+#ifndef __WXWINCE__

     long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);
     if (style & BS_BITMAP)
     {
     long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);
     if (style & BS_BITMAP)
     {


@@ -112,47 +130,58 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 #endif
 
     LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) 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;
 
     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())
-        bitmap = &m_buttonBitmapFocus;
-    else if ((state & ODS_DISABLED) && m_buttonBitmapDisabled.Ok())
-        bitmap = &m_buttonBitmapDisabled;
+    if ( isSelected && m_bmpSelected.Ok() )
+        bitmap = &m_bmpSelected;
+    else if ((state & ODS_FOCUS) && m_bmpFocus.Ok())
+        bitmap = &m_bmpFocus;
+    else if ((state & ODS_DISABLED) && m_bmpDisabled.Ok())
+        bitmap = &m_bmpDisabled;

     else
     else

-        bitmap = &m_buttonBitmap;
+        bitmap = &m_bmpNormal;

 
     if ( !bitmap->Ok() )
         return FALSE;
 
 
     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,
     if ( autoDraw )
     {
         DrawFace((WXHDC) hDC,


@@ -161,43 +190,12 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
                  isSelected);
     }
 
                  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;
-    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
-        ok = ::MaskBlt(
-                       hDC, x1, y1, wBmp, hBmp,                 // dst
-                       memDC, 0, 0,                             // src
-                       (HBITMAP)mask->GetMaskBitmap(), 0, 0,    // mask
-                       MAKEROP4(SRCCOPY,                        // fg ROP
-                                SRCPAINT)                       // bg ROP
-                      );
-    }
-    else
-    {
-        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,
     if ( (state & ODS_DISABLED) && autoDraw )
     {
         DrawButtonDisable((WXHDC) hDC,


@@ -215,78 +213,132 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
                         isSelected);
     }
 
                         isSelected);
     }
 

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

     return TRUE;
 }
 
     return TRUE;
 }
 

+// GRG Feb/2000, support for bmp buttons with Win95/98 standard LNF
+
+#if defined(__WIN95__)
+

 void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel )
 {
     HPEN oldp;
 void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel )
 {
     HPEN oldp;

-    HBRUSH oldb ;
-
-    HPEN penBorder;
+    HPEN penHiLight;

     HPEN penLight;
     HPEN penShadow;
     HPEN penLight;
     HPEN penShadow;

+    HPEN penDkShadow;

     HBRUSH brushFace;
     HBRUSH brushFace;

-    COLORREF ms_color;

 
 

-    ms_color = GetSysColor(COLOR_WINDOWFRAME) ;
-    penBorder = CreatePen(PS_SOLID,0,ms_color) ;
+    // create needed pens and brush
+    penHiLight  = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DHILIGHT));
+    penLight    = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DLIGHT));
+    penShadow   = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DSHADOW));
+    penDkShadow = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DDKSHADOW));
+    // brushFace   = CreateSolidBrush(GetSysColor(COLOR_BTNFACE));
+    // Taking the background colour fits in better with
+    // Windows XP themes.
+    brushFace   = CreateSolidBrush(m_backgroundColour.m_pixel);
+
+    // draw the rectangle
+    RECT rect;
+    rect.left   = left;
+    rect.right  = right;
+    rect.top    = top;
+    rect.bottom = bottom;
+    FillRect((HDC) dc, &rect, brushFace);
+
+    // draw the border
+    oldp = (HPEN) SelectObject( (HDC) dc, sel? penDkShadow : penHiLight);
+
+    wxDrawLine((HDC) dc, left, top, right-1, top);
+    wxDrawLine((HDC) dc, left, top+1, left, bottom-1);
+
+    SelectObject( (HDC) dc, sel? penShadow : penLight);
+    wxDrawLine((HDC) dc, left+1, top+1, right-2, top+1);
+    wxDrawLine((HDC) dc, left+1, top+2, left+1, bottom-2);
+
+    SelectObject( (HDC) dc, sel? penLight : penShadow);
+    wxDrawLine((HDC) dc, left+1, bottom-2, right-1, bottom-2);
+    wxDrawLine((HDC) dc, right-2, bottom-3, right-2, top);
+
+    SelectObject( (HDC) dc, sel? penHiLight : penDkShadow);
+    wxDrawLine((HDC) dc, left, bottom-1, right+2, bottom-1);
+    wxDrawLine((HDC) dc, right-1, bottom-2, right-1, top-1);
+
+    // delete allocated resources
+    SelectObject((HDC) dc,oldp);
+    DeleteObject(penHiLight);
+    DeleteObject(penLight);
+    DeleteObject(penShadow);
+    DeleteObject(penDkShadow);
+    DeleteObject(brushFace);
+}
+
+#else

 
 

-    ms_color = GetSysColor(COLOR_BTNSHADOW) ;
-    penShadow = CreatePen(PS_SOLID,0,ms_color) ;
+void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel )
+{
+    HPEN oldp;
+    HPEN penBorder;
+    HPEN penLight;
+    HPEN penShadow;
+    HBRUSH brushFace;

 
 

-    ms_color = GetSysColor(COLOR_BTNHIGHLIGHT) ;
-    penLight = CreatePen(PS_SOLID,0,ms_color) ;
+    // create needed pens and brush
+    penBorder = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_WINDOWFRAME));
+    penShadow = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_BTNSHADOW));
+    penLight  = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_BTNHIGHLIGHT));
+    brushFace = CreateSolidBrush(COLOR_BTNFACE);

 
 

-    ms_color = GetSysColor(COLOR_BTNFACE) ;
-    brushFace = CreateSolidBrush(ms_color) ;
+    // draw the rectangle
+    RECT rect;
+    rect.left   = left;
+    rect.right  = right;
+    rect.top    = top;
+    rect.bottom = bottom;
+    FillRect((HDC) dc, &rect, brushFace);

 
 

-    oldp = (HPEN) SelectObject( (HDC) dc, GetStockObject( NULL_PEN ) ) ;
-    oldb = (HBRUSH) SelectObject( (HDC) dc, brushFace ) ;
-    Rectangle( (HDC) dc, left, top, right, bottom ) ;
-    SelectObject( (HDC) dc, penBorder) ;
+    // draw the border
+    oldp = (HPEN) 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) ;
+    SelectObject( (HDC) dc, penShadow);

     if (sel)
     {
     if (sel)
     {

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

     }
     else
     {
     }
     else
     {

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

     }
     }

-    SelectObject((HDC) dc,oldp) ;
-    SelectObject((HDC) dc,oldb) ;

 
 

+    // delete allocated resources
+    SelectObject((HDC) dc,oldp);

     DeleteObject(penBorder);
     DeleteObject(penLight);
     DeleteObject(penShadow);
     DeleteObject(brushFace);
 }
 
     DeleteObject(penBorder);
     DeleteObject(penLight);
     DeleteObject(penShadow);
     DeleteObject(brushFace);
 }
 

-// VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN
-#define FOCUS_MARGIN 3
+#endif // defined(__WIN95__)
+

 
 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 )
 {


@@ -295,16 +347,21 @@ void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, in
     rect.top = top;
     rect.right = right;
     rect.bottom = bottom;
     rect.top = top;
     rect.right = right;
     rect.bottom = bottom;

-    InflateRect( &rect, - FOCUS_MARGIN, - FOCUS_MARGIN ) ;
+    InflateRect( &rect, - FOCUS_MARGIN, - FOCUS_MARGIN );
+
+    // GRG: the focus rectangle should not move when the button is pushed!
+/*

     if ( sel )
     if ( sel )

-        OffsetRect( &rect, 1, 1 ) ;
-    DrawFocusRect( (HDC) dc, &rect ) ;
+        OffsetRect( &rect, 1, 1 );
+*/
+       (void)sel;
+    DrawFocusRect( (HDC) dc, &rect );

 }
 
 extern HBRUSH wxDisableButtonBrush;
 void wxBitmapButton::DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg )
 {
 }
 
 extern HBRUSH wxDisableButtonBrush;
 void wxBitmapButton::DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg )
 {

-    HBRUSH  old = (HBRUSH) SelectObject( (HDC) dc, wxDisableButtonBrush ) ;
+    HBRUSH  old = (HBRUSH) SelectObject( (HDC) dc, wxDisableButtonBrush );

 
     // VZ: what's this?? there is no such ROP AFAIK
 #ifdef __SALFORDC__
 
     // VZ: what's this?? there is no such ROP AFAIK
 #ifdef __SALFORDC__


@@ -323,10 +380,12 @@ void wxBitmapButton::DrawButtonDisable( WXHDC dc, int left, int top, int right,
 
     ::PatBlt( (HDC) dc, left, top, right, bottom, dwRop);
 
 
     ::PatBlt( (HDC) dc, left, top, right, bottom, dwRop);
 

-    ::SelectObject( (HDC) dc, old ) ;
+    ::SelectObject( (HDC) dc, old );

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

+
+#endif // wxUSE_BMPBUTTON