X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c331ded69073da6d9b2cec4a12eb09e63347892..eeccd5d94ce6b11f36af95db4ac528a2e2e0c4c5:/src/msw/bmpbuttn.cpp

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index af8a1e72fe..6af2e7c60d 100644
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -44,16 +44,16 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 
   parent->AddChild(this);
 
-  m_backgroundColour = parent->GetDefaultBackgroundColour() ;
-  m_foregroundColour = parent->GetDefaultForegroundColour() ;
+  m_backgroundColour = parent->GetBackgroundColour() ;
+  m_foregroundColour = parent->GetForegroundColour() ;
   m_windowStyle = style;
   m_marginX = 0;
   m_marginY = 0;
 
   if ( style & wxBU_AUTODRAW )
   {
-	m_marginX = wxDEFAULT_BUTTON_MARGIN;
-	m_marginY = wxDEFAULT_BUTTON_MARGIN;
+    m_marginX = wxDEFAULT_BUTTON_MARGIN;
+    m_marginY = wxDEFAULT_BUTTON_MARGIN;
   }
 
   int x = pos.x;
@@ -67,10 +67,10 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
     m_windowId = id;
 
   if ( width == -1 && bitmap.Ok())
-	width = bitmap.GetWidth() + 2*m_marginX;
+    width = bitmap.GetWidth() + 2*m_marginX;
 
   if ( height == -1 && bitmap.Ok())
-	height = bitmap.GetHeight() + 2*m_marginY;
+    height = bitmap.GetHeight() + 2*m_marginY;
 
   HWND wx_button =
     CreateWindowEx(0, "BUTTON", "", BS_OWNERDRAW | WS_TABSTOP | WS_CHILD,
@@ -82,7 +82,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
   // Subclass again for purposes of dialog editing mode
   SubclassWin((WXHWND)wx_button);
 
-  SetFont(* parent->GetFont()) ;
+  SetFont(parent->GetFont()) ;
 
   SetSize(x, y, width, height);
   ShowWindow(wx_button, SW_SHOW);
@@ -97,22 +97,22 @@ void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 
 bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 {
-	long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);
 #if defined(__WIN95__)
-	if (style & BS_BITMAP)
-	{
-		// Should we call Default() here?
-//		Default();
-
-		// Let default procedure draw the bitmap, which is defined
-		// in the Windows resource.
-		return FALSE;
-	}
+    long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);
+    if (style & BS_BITMAP)
+    {
+        // Should we call Default() here?
+//      Default();
+
+        // Let default procedure draw the bitmap, which is defined
+        // in the Windows resource.
+        return FALSE;
+    }
 #endif
 
     LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item;
 
-	wxBitmap* bitmap = &m_buttonBitmap;
+    wxBitmap* bitmap = &m_buttonBitmap;
 
 	UINT state = lpDIS->itemState;
 	if ((state & ODS_SELECTED) && m_buttonBitmapSelected.Ok())
@@ -133,8 +133,6 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 	if (!old)
 		return FALSE;
 
-	RECT rect = lpDIS->rcItem;
-
 	int x = lpDIS->rcItem.left;
 	int y = lpDIS->rcItem.top;
 	int width = lpDIS->rcItem.right - x;
@@ -145,24 +143,24 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 		DrawFace((WXHDC) hDC, lpDIS->rcItem.left, lpDIS->rcItem.top, lpDIS->rcItem.right, lpDIS->rcItem.bottom,
             ((state & ODS_SELECTED) == ODS_SELECTED));
 
-	// Centre the bitmap in the control area
-	int x1 = (int) (x + ((width - bitmap->GetWidth()) / 2));
-	int y1 = (int) (y + ((height - bitmap->GetHeight()) / 2));
+    // Centre the bitmap in the control area
+    int x1 = (int) (x + ((width - bitmap->GetWidth()) / 2));
+    int y1 = (int) (y + ((height - bitmap->GetHeight()) / 2));
 
-	if ( (state & ODS_SELECTED) && (GetWindowStyleFlag() & wxBU_AUTODRAW) )
-	{
-		x1 ++;
-		y1 ++;
-	}
+    if ( (state & ODS_SELECTED) && (GetWindowStyleFlag() & wxBU_AUTODRAW) )
+    {
+        x1 ++;
+        y1 ++;
+    }
 
-	::BitBlt(hDC, x1, y1, bitmap->GetWidth(), bitmap->GetHeight(), memDC, 0, 0, SRCCOPY);
+    ::BitBlt(hDC, x1, y1, bitmap->GetWidth(), bitmap->GetHeight(), memDC, 0, 0, SRCCOPY);
 
-	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) && (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));
 
-	::SelectObject(memDC, old);
+    ::SelectObject(memDC, old);
 
     ::DeleteDC(memDC);
 
@@ -171,8 +169,8 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 
 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;
@@ -180,51 +178,51 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int botto
   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) ;
 
-	ms_color = GetSysColor(COLOR_BTNSHADOW) ;
-	penShadow = CreatePen(PS_SOLID,0,ms_color) ;
+    ms_color = GetSysColor(COLOR_BTNSHADOW) ;
+    penShadow = CreatePen(PS_SOLID,0,ms_color) ;
 
-	ms_color = GetSysColor(COLOR_BTNHIGHLIGHT) ;
-	penLight = CreatePen(PS_SOLID,0,ms_color) ;
+    ms_color = GetSysColor(COLOR_BTNHIGHLIGHT) ;
+    penLight = CreatePen(PS_SOLID,0,ms_color) ;
 
-	ms_color = GetSysColor(COLOR_BTNFACE) ;
-	brushFace = CreateSolidBrush(ms_color) ;
+    ms_color = GetSysColor(COLOR_BTNFACE) ;
+    brushFace = CreateSolidBrush(ms_color) ;
 
-	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) ;
+    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) ;
         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)
-	{
-		MoveToEx((HDC) dc,left+1	,bottom-2	,NULL) ;
-		LineTo((HDC) dc,  left+1	,top+1) ;
-		LineTo((HDC) dc,  right-2	,top+1) ;
-	}
-	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) ;
-	}
-	SelectObject((HDC) dc,oldp) ;
-	SelectObject((HDC) dc,oldb) ;
+    SelectObject( (HDC) dc, penShadow) ;
+    if (sel)
+    {
+        MoveToEx((HDC) dc,left+1    ,bottom-2   ,NULL) ;
+        LineTo((HDC) dc,  left+1    ,top+1) ;
+        LineTo((HDC) dc,  right-2   ,top+1) ;
+    }
+    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) ;
+    }
+    SelectObject((HDC) dc,oldp) ;
+    SelectObject((HDC) dc,oldb) ;
 
   DeleteObject(penBorder);
   DeleteObject(penLight);
@@ -236,28 +234,36 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int botto
 
 void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel )
 {
-	RECT rect;
-	rect.left = left;
-	rect.top = top;
-	rect.right = right;
-	rect.bottom = bottom;
-	InflateRect( &rect, - FOCUS_MARGIN, - FOCUS_MARGIN ) ;
-	if ( sel )
-		OffsetRect( &rect, 1, 1 ) ;
-	DrawFocusRect( (HDC) dc, &rect ) ;
+    RECT rect;
+    rect.left = left;
+    rect.top = top;
+    rect.right = right;
+    rect.bottom = bottom;
+    InflateRect( &rect, - FOCUS_MARGIN, - FOCUS_MARGIN ) ;
+    if ( sel )
+        OffsetRect( &rect, 1, 1 ) ;
+    DrawFocusRect( (HDC) dc, &rect ) ;
 }
 
 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 ) ;
-
-	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 ) ;
-
-	::SelectObject( (HDC) dc, old ) ;
+    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,
+#ifdef __SALFORDC__
+       0xfa0089L ) ;
+#else
+       0xfa0089UL ) ;
+#endif
+    ::SelectObject( (HDC) dc, old ) ;
 }