Add comments explaining the workaround for mingw 3.2.3

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

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index fb359b0434642061bbbebaaa534611f0bcbb2259..e1be21611f2270c55b891b3106919f67fcb30a17 100644 (file)
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -29,6 +29,7 @@
 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"

+#include "wx/image.h"

 
 // ----------------------------------------------------------------------------
 // macros
 
 // ----------------------------------------------------------------------------
 // macros


@@ -38,56 +39,60 @@
 
 WX_DEFINE_FLAGS( wxBitmapButtonStyle )
 
 
 WX_DEFINE_FLAGS( wxBitmapButtonStyle )
 

-WX_BEGIN_FLAGS( wxBitmapButtonStyle )
+wxBEGIN_FLAGS( wxBitmapButtonStyle )

     // new style border flags, we put them first to
     // use them for streaming out
     // new style border flags, we put them first to
     // use them for streaming out

-    WX_FLAGS_MEMBER(wxBORDER_SIMPLE)
-    WX_FLAGS_MEMBER(wxBORDER_SUNKEN)
-    WX_FLAGS_MEMBER(wxBORDER_DOUBLE)
-    WX_FLAGS_MEMBER(wxBORDER_RAISED)
-    WX_FLAGS_MEMBER(wxBORDER_STATIC)
-    WX_FLAGS_MEMBER(wxBORDER_NONE)
-    
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+

     // old style border flags
     // old style border flags

-    WX_FLAGS_MEMBER(wxSIMPLE_BORDER)
-    WX_FLAGS_MEMBER(wxSUNKEN_BORDER)
-    WX_FLAGS_MEMBER(wxDOUBLE_BORDER)
-    WX_FLAGS_MEMBER(wxRAISED_BORDER)
-    WX_FLAGS_MEMBER(wxSTATIC_BORDER)
-    WX_FLAGS_MEMBER(wxNO_BORDER)
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)

 
     // standard window styles
 
     // standard window styles

-    WX_FLAGS_MEMBER(wxTAB_TRAVERSAL)
-    WX_FLAGS_MEMBER(wxCLIP_CHILDREN)
-    WX_FLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    WX_FLAGS_MEMBER(wxWANTS_CHARS)
-    WX_FLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
-    WX_FLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    WX_FLAGS_MEMBER(wxVSCROLL)
-    WX_FLAGS_MEMBER(wxHSCROLL)
-
-    WX_FLAGS_MEMBER(wxBU_AUTODRAW)
-    WX_FLAGS_MEMBER(wxBU_LEFT)
-    WX_FLAGS_MEMBER(wxBU_RIGHT)
-    WX_FLAGS_MEMBER(wxBU_TOP)
-    WX_FLAGS_MEMBER(wxBU_BOTTOM)
-WX_END_FLAGS( wxBitmapButtonStyle )
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxBU_AUTODRAW)
+    wxFLAGS_MEMBER(wxBU_LEFT)
+    wxFLAGS_MEMBER(wxBU_RIGHT)
+    wxFLAGS_MEMBER(wxBU_TOP)
+    wxFLAGS_MEMBER(wxBU_BOTTOM)
+wxEND_FLAGS( wxBitmapButtonStyle )

 
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxBitmapButton, wxButton,"wx/bmpbuttn.h")
 
 
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxBitmapButton, wxButton,"wx/bmpbuttn.h")
 

-WX_BEGIN_PROPERTIES_TABLE(wxBitmapButton)
-    WX_PROPERTY_FLAGS( WindowStyle , wxBitmapButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-WX_END_PROPERTIES_TABLE()
+wxBEGIN_PROPERTIES_TABLE(wxBitmapButton)
+    wxPROPERTY_FLAGS( WindowStyle , wxBitmapButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()

 
 

-WX_BEGIN_HANDLERS_TABLE(wxBitmapButton)
-WX_END_HANDLERS_TABLE()
+wxBEGIN_HANDLERS_TABLE(wxBitmapButton)
+wxEND_HANDLERS_TABLE()

 
 

-WX_CONSTRUCTOR_5( wxBitmapButton , wxWindow* , Parent , wxWindowID , Id , wxBitmap , Bitmap , wxPoint , Position , wxSize , Size )
+wxCONSTRUCTOR_5( wxBitmapButton , wxWindow* , Parent , wxWindowID , Id , wxBitmap , Bitmap , wxPoint , Position , wxSize , Size )

 
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 #endif
 
 
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 #endif
 

+BEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase)
+    EVT_SYS_COLOUR_CHANGED(wxBitmapButton::OnSysColourChanged)
+END_EVENT_TABLE()
+

 /*
 TODO PROPERTIES :
 
 /*
 TODO PROPERTIES :
 


@@ -100,48 +105,38 @@ bitmap "disabled" ,
 
 #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
 
 
 #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
 

-bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
-           const wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
+bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
+    const wxBitmap& bitmap,
+    const wxPoint& pos,
+    const wxSize& size, long style,
+    const wxValidator& wxVALIDATOR_PARAM(validator),
+    const wxString& name)

 {
 {

-  m_bmpNormal = bitmap;
-  SetName(name);
+    m_bmpNormal = bitmap;
+    SetName(name);

 
 #if wxUSE_VALIDATORS
 
 #if wxUSE_VALIDATORS

-  SetValidator(validator);
+    SetValidator(validator);

 #endif // wxUSE_VALIDATORS
 
 #endif // wxUSE_VALIDATORS
 

-  parent->AddChild(this);
-
-  m_backgroundColour = parent->GetBackgroundColour();
-  m_foregroundColour = parent->GetForegroundColour();
-  m_windowStyle = style;
-
-  if ( style & wxBU_AUTODRAW )
-  {
-    m_marginX = wxDEFAULT_BUTTON_MARGIN;
-    m_marginY = wxDEFAULT_BUTTON_MARGIN;
-  }
-
-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
+    parent->AddChild(this);

 
 

-  if (id == -1)
-    m_windowId = NewControlId();
-  else
-    m_windowId = id;
+    m_backgroundColour = parent->GetBackgroundColour();
+    m_foregroundColour = parent->GetForegroundColour();
+    m_windowStyle = style;

 
 

-  if ( width == -1 && bitmap.Ok())
-    width = bitmap.GetWidth() + 2*m_marginX;
+    if ( style & wxBU_AUTODRAW )
+    {
+        m_marginX = wxDEFAULT_BUTTON_MARGIN;
+        m_marginY = wxDEFAULT_BUTTON_MARGIN;
+    }

 
 

-  if ( height == -1 && bitmap.Ok())
-    height = bitmap.GetHeight() + 2*m_marginY;
+    if (id == wxID_ANY)
+        m_windowId = NewControlId();
+    else
+        m_windowId = id;

 
 

-       long msStyle = WS_VISIBLE | WS_TABSTOP | WS_CHILD | BS_OWNERDRAW ;
+    long msStyle = WS_VISIBLE | WS_TABSTOP | WS_CHILD | BS_OWNERDRAW ;

 
     if ( m_windowStyle & wxCLIP_SIBLINGS )
         msStyle |= WS_CLIPSIBLINGS;
 
     if ( m_windowStyle & wxCLIP_SIBLINGS )
         msStyle |= WS_CLIPSIBLINGS;


@@ -157,8 +152,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
         msStyle |= BS_BOTTOM;
 #endif
 
         msStyle |= BS_BOTTOM;
 #endif
 

-  m_hWnd = (WXHWND)CreateWindowEx
-                   (
+    m_hWnd = (WXHWND) CreateWindowEx(

                     0,
                     wxT("BUTTON"),
                     wxEmptyString,
                     0,
                     wxT("BUTTON"),
                     wxEmptyString,


@@ -170,14 +164,40 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
                     NULL
                    );
 
                     NULL
                    );
 

-  // Subclass again for purposes of dialog editing mode
-  SubclassWin(m_hWnd);
+    // Subclass again for purposes of dialog editing mode
+    SubclassWin(m_hWnd);
+
+    SetPosition(pos);
+    SetBestSize(size);
+
+    return true;
+}
+
+bool wxBitmapButton::SetBackgroundColour(const wxColour& colour)
+{
+    if ( !wxBitmapButtonBase::SetBackgroundColour(colour) )
+    {
+        // didn't change
+        return false;
+    }
+
+    // invalidate the brush, it will be recreated the next time it's needed
+    m_brushDisabled = wxNullBrush;
+
+    return true;
+}

 
 

-  SetFont(parent->GetFont());
+void wxBitmapButton::OnSysColourChanged(wxSysColourChangedEvent& event)
+{
+    m_brushDisabled = wxNullBrush;

 
 

-  SetSize(x, y, width, height);
+    if ( !IsEnabled() )
+    {
+        // this change affects our current state
+        Refresh();
+    }

 
 

-  return TRUE;
+    event.Skip();

 }
 
 // VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN
 }
 
 // VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN


@@ -191,7 +211,7 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     {
         // Let default procedure draw the bitmap, which is defined
         // in the Windows resource.
     {
         // Let default procedure draw the bitmap, which is defined
         // in the Windows resource.

-        return FALSE;
+        return false;

     }
 #endif
 
     }
 #endif
 


@@ -215,7 +235,7 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
         bitmap = &m_bmpNormal;
 
     if ( !bitmap->Ok() )
         bitmap = &m_bmpNormal;
 
     if ( !bitmap->Ok() )

-        return FALSE;
+        return false;

 
     // centre the bitmap in the control area
     int x      = lpDIS->rcItem.left;
 
     // centre the bitmap in the control area
     int x      = lpDIS->rcItem.left;


@@ -225,8 +245,8 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     int wBmp   = bitmap->GetWidth();
     int hBmp   = bitmap->GetHeight();
 
     int wBmp   = bitmap->GetWidth();
     int hBmp   = bitmap->GetHeight();
 

-       int x1,y1;
-       
+    int x1,y1;
+

     if(m_windowStyle & wxBU_LEFT)
         x1 = x + (FOCUS_MARGIN+1);
     else if(m_windowStyle & wxBU_RIGHT)
     if(m_windowStyle & wxBU_LEFT)
         x1 = x + (FOCUS_MARGIN+1);
     else if(m_windowStyle & wxBU_RIGHT)


@@ -258,8 +278,8 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 
     // draw the bitmap
     wxDC dst;
 
     // draw the bitmap
     wxDC dst;

-    dst.SetHDC((WXHDC) hDC, FALSE);
-    dst.DrawBitmap(*bitmap, x1, y1, TRUE);
+    dst.SetHDC((WXHDC) hDC, false);
+    dst.DrawBitmap(*bitmap, x1, y1, true);

 
     // draw focus / disabled state, if auto-drawing
     if ( (state & ODS_DISABLED) && autoDraw )
 
     // draw focus / disabled state, if auto-drawing
     if ( (state & ODS_DISABLED) && autoDraw )


@@ -267,7 +287,7 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
         DrawButtonDisable((WXHDC) hDC,
                           lpDIS->rcItem.left, lpDIS->rcItem.top,
                           lpDIS->rcItem.right, lpDIS->rcItem.bottom,
         DrawButtonDisable((WXHDC) hDC,
                           lpDIS->rcItem.left, lpDIS->rcItem.top,
                           lpDIS->rcItem.right, lpDIS->rcItem.bottom,

-                          TRUE);
+                          true);

     }
     else if ( (state & ODS_FOCUS) && autoDraw )
     {
     }
     else if ( (state & ODS_FOCUS) && autoDraw )
     {


@@ -279,14 +299,15 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
                         isSelected);
     }
 
                         isSelected);
     }
 

-    return TRUE;
+    return true;

 }
 
 // GRG Feb/2000, support for bmp buttons with Win95/98 standard LNF
 
 #if defined(__WIN95__)
 
 }
 
 // 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 )
+void wxBitmapButton::DrawFace( WXHDC dc, int left, int top,
+    int right, int bottom, bool sel )

 {
     HPEN oldp;
     HPEN penHiLight;
 {
     HPEN oldp;
     HPEN penHiLight;


@@ -342,7 +363,8 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int botto
 
 #else
 
 
 #else
 

-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;
     HPEN penBorder;
 {
     HPEN oldp;
     HPEN penBorder;


@@ -406,7 +428,8 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int botto
 #endif // defined(__WIN95__)
 
 
 #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 WXUNUSED(sel) )

 {
     RECT rect;
     rect.left = left;
 {
     RECT rect;
     rect.left = left;


@@ -420,21 +443,36 @@ void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, in
     if ( sel )
         OffsetRect( &rect, 1, 1 );
 */
     if ( sel )
         OffsetRect( &rect, 1, 1 );
 */

-       (void)sel;
+

     DrawFocusRect( (HDC) dc, &rect );
 }
 
     DrawFocusRect( (HDC) dc, &rect );
 }
 

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

 {
 {

-    HBRUSH  old = (HBRUSH) SelectObject( (HDC) dc, wxDisableButtonBrush );
+    if ( !m_brushDisabled.Ok() )
+    {
+        // draw a bitmap with two black and two background colour pixels
+        wxBitmap bmp(2, 2);
+        wxMemoryDC dc;
+        dc.SelectObject(bmp);
+        dc.SetPen(*wxBLACK_PEN);
+        dc.DrawPoint(0, 0);
+        dc.DrawPoint(1, 1);
+        dc.SetPen(GetBackgroundColour());
+        dc.DrawPoint(0, 1);
+        dc.DrawPoint(1, 0);
+
+        m_brushDisabled = wxBrush(bmp);
+    }

 
 

-    // VZ: what's this?? there is no such ROP AFAIK
-#ifdef __SALFORDC__
-    DWORD dwRop = 0xFA0089L;
-#else
-    DWORD dwRop = 0xFA0089UL;
-#endif
+    SelectInHDC selectBrush((HDC)dc, GetHbrushOf(m_brushDisabled));
+
+    // ROP for "dest |= pattern" operation -- as it doesn't have a standard
+    // name, give it our own
+    static const DWORD PATTERNPAINT = 0xFA0089UL;

 
     if ( with_marg )
     {
 
     if ( with_marg )
     {


@@ -444,9 +482,7 @@ void wxBitmapButton::DrawButtonDisable( WXHDC dc, int left, int top, int right,
         bottom -= 2 * m_marginY;
     }
 
         bottom -= 2 * m_marginY;
     }
 

-    ::PatBlt( (HDC) dc, left, top, right, bottom, dwRop);
-
-    ::SelectObject( (HDC) dc, old );
+    ::PatBlt( (HDC) dc, left, top, right, bottom, PATTERNPAINT);

 }
 
 void wxBitmapButton::SetDefault()
 }
 
 void wxBitmapButton::SetDefault()


@@ -454,4 +490,17 @@ void wxBitmapButton::SetDefault()
     wxButton::SetDefault();
 }
 
     wxButton::SetDefault();
 }
 

+wxSize wxBitmapButton::DoGetBestSize() const
+{
+    if ( m_bmpNormal.Ok() )
+    {
+        return wxSize(m_bmpNormal.GetWidth() + 2*m_marginX,
+                      m_bmpNormal.GetHeight() + 2*m_marginY);
+    }
+
+    // no idea what our best size should be, defer to the base class
+    return wxBitmapButtonBase::DoGetBestSize();
+}
+

 #endif // wxUSE_BMPBUTTON
 #endif // wxUSE_BMPBUTTON

+