Applied patch from Neil Robinson to allow manipulation of unattached menubars

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

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index b8ae50c907c7906e978b403493d85980bbea641f..3b67925eaafcdc033e656c5b57090adb58cf5094 100644 (file)
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -26,6 +26,7 @@
 
 #include "wx/msw/private.h"
 #include "wx/image.h"
 
 #include "wx/msw/private.h"
 #include "wx/image.h"

+#include "wx/msw/uxtheme.h"

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


@@ -87,6 +88,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 
 BEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase)
     EVT_SYS_COLOUR_CHANGED(wxBitmapButton::OnSysColourChanged)
 
 BEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase)
     EVT_SYS_COLOUR_CHANGED(wxBitmapButton::OnSysColourChanged)

+    EVT_ENTER_WINDOW(wxBitmapButton::OnMouseEnterOrLeave)
+    EVT_LEAVE_WINDOW(wxBitmapButton::OnMouseEnterOrLeave)

 END_EVENT_TABLE()
 
 /*
 END_EVENT_TABLE()
 
 /*


@@ -121,8 +124,8 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
 
     if ( style & wxBU_AUTODRAW )
     {
 
     if ( style & wxBU_AUTODRAW )
     {

-        m_marginX = wxDEFAULT_BUTTON_MARGIN;
-        m_marginY = wxDEFAULT_BUTTON_MARGIN;
+        m_marginX =
+        m_marginY = 4;

     }
 
     if (id == wxID_ANY)
     }
 
     if (id == wxID_ANY)


@@ -194,6 +197,34 @@ void wxBitmapButton::OnSysColourChanged(wxSysColourChangedEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

+void wxBitmapButton::OnMouseEnterOrLeave(wxMouseEvent& event)
+{
+    if ( IsEnabled() && m_bmpHover.Ok() )
+        Refresh();
+
+    event.Skip();
+}
+
+void wxBitmapButton::OnSetBitmap()
+{
+    // if the focus bitmap is specified but hover one isn't, use the focus
+    // bitmap for hovering as well if this is consistent with the current
+    // Windows version look and feel
+    //
+    // rationale: this is compatible with the old wxGTK behaviour and also
+    // makes it much easier to do "the right thing" for all platforms (some of
+    // them, such as Windows XP, have "hot" buttons while others don't)
+    if ( !m_bmpHover.Ok() &&
+            m_bmpFocus.Ok() &&
+                wxUxThemeEngine::GetIfActive() )
+    {
+        m_bmpHover = m_bmpFocus;
+    }
+
+    // this will redraw us
+    wxBitmapButtonBase::OnSetBitmap();
+}
+

 // VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN
 #define FOCUS_MARGIN 3
 
 // VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN
 #define FOCUS_MARGIN 3
 


@@ -217,10 +248,12 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 
 
     // choose the bitmap to use depending on the button state
 
 
     // choose the bitmap to use depending on the button state

-    wxBitmap* bitmap;
+    wxBitmap *bitmap;

 
     if ( isSelected && m_bmpSelected.Ok() )
         bitmap = &m_bmpSelected;
 
     if ( isSelected && m_bmpSelected.Ok() )
         bitmap = &m_bmpSelected;

+    else if ( m_bmpHover.Ok() && IsMouseInWindow() )
+        bitmap = &m_bmpHover;

     else if ((state & ODS_FOCUS) && m_bmpFocus.Ok())
         bitmap = &m_bmpFocus;
     else if ((state & ODS_DISABLED) && m_bmpDisabled.Ok())
     else if ((state & ODS_FOCUS) && m_bmpFocus.Ok())
         bitmap = &m_bmpFocus;
     else if ((state & ODS_DISABLED) && m_bmpDisabled.Ok())


@@ -271,8 +304,7 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     }
 
     // draw the bitmap
     }
 
     // draw the bitmap

-    wxDC dst;
-    dst.SetHDC((WXHDC) hDC, false);
+    wxDCTemp dst((WXHDC)hDC);

     dst.DrawBitmap(*bitmap, x1, y1, true);
 
     // draw focus / disabled state, if auto-drawing
     dst.DrawBitmap(*bitmap, x1, y1, true);
 
     // draw focus / disabled state, if auto-drawing


@@ -298,8 +330,6 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 
 // GRG Feb/2000, support for bmp buttons with Win95/98 standard LNF
 
 
 // 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 )
 {


@@ -355,73 +385,6 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top,
     DeleteObject(brushFace);
 }
 
     DeleteObject(brushFace);
 }
 

-#else
-
-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;
-
-    // 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);
-
-    // 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, 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);
-    }
-
-    // delete allocated resources
-    SelectObject((HDC) dc,oldp);
-    DeleteObject(penBorder);
-    DeleteObject(penLight);
-    DeleteObject(penShadow);
-    DeleteObject(brushFace);
-}
-
-#endif // defined(__WIN95__)
-
-

 void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right,
     int bottom, bool WXUNUSED(sel) )
 {
 void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right,
     int bottom, bool WXUNUSED(sel) )
 {


@@ -499,4 +462,3 @@ wxSize wxBitmapButton::DoGetBestSize() const
 }
 
 #endif // wxUSE_BMPBUTTON
 }
 
 #endif // wxUSE_BMPBUTTON

-