fix bug with wxCSConv("ASCII")

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

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index c47f2abc913d2b80447fec1d1137a0e58970bc52..5cc8685060d0df4e8ec6de517d82356cd986c75a 100644 (file)
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -23,10 +23,11 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/dcmemory.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/dcmemory.h"

+    #include "wx/image.h"

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

-#include "wx/image.h"
+#include "wx/msw/dc.h"          // for wxDCTemp

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


@@ -123,70 +124,41 @@ bitmap "focus" ,
 bitmap "disabled" ,
 */
 
 bitmap "disabled" ,
 */
 

-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)
+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);
-
-#if wxUSE_VALIDATORS
-    SetValidator(validator);
-#endif // wxUSE_VALIDATORS
-
-    parent->AddChild(this);
+    if ( !CreateControl(parent, id, pos, size, style, validator, name) )
+        return false;

 
 

-    m_windowStyle = style;
+    SetBitmapLabel(bitmap);

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

-    {
-        m_marginX =
-        m_marginY = 4;
-    }
+        SetMargins(4, 4);

 
 

-    if (id == wxID_ANY)
-        m_windowId = NewControlId();
-    else
-        m_windowId = id;
+    return MSWCreateControl(_T("BUTTON"), wxEmptyString, pos, size);
+}

 
 

-    long msStyle = WS_VISIBLE | WS_TABSTOP | WS_CHILD | BS_OWNERDRAW ;
+WXDWORD wxBitmapButton::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+    WXDWORD msStyle = wxButton::MSWGetStyle(style, exstyle);

 
 

-    if ( m_windowStyle & wxCLIP_SIBLINGS )
-        msStyle |= WS_CLIPSIBLINGS;
+    msStyle |= BS_OWNERDRAW;

 
 

-#ifdef __WIN32__
-    if(m_windowStyle & wxBU_LEFT)
+    if ( style & wxBU_LEFT )

         msStyle |= BS_LEFT;
         msStyle |= BS_LEFT;

-    if(m_windowStyle & wxBU_RIGHT)
+    if ( style & wxBU_RIGHT )

         msStyle |= BS_RIGHT;
         msStyle |= BS_RIGHT;

-    if(m_windowStyle & wxBU_TOP)
+    if ( style & wxBU_TOP )

         msStyle |= BS_TOP;
         msStyle |= BS_TOP;

-    if(m_windowStyle & wxBU_BOTTOM)
+    if ( style & wxBU_BOTTOM )

         msStyle |= BS_BOTTOM;
         msStyle |= BS_BOTTOM;

-#endif
-
-    m_hWnd = (WXHWND) CreateWindowEx(
-                    0,
-                    wxT("BUTTON"),
-                    wxEmptyString,
-                    msStyle,
-                    0, 0, 0, 0,
-                    GetWinHwnd(parent),
-                    (HMENU)m_windowId,
-                    wxGetInstance(),
-                    NULL
-                   );
-
-    // Subclass again for purposes of dialog editing mode
-    SubclassWin(m_hWnd);

 
 

-    SetPosition(pos);
-    SetBestSize(size);
-
-    return true;
+    return msStyle;

 }
 
 bool wxBitmapButton::SetBackgroundColour(const wxColour& colour)
 }
 
 bool wxBitmapButton::SetBackgroundColour(const wxColour& colour)


@@ -224,7 +196,19 @@ void wxBitmapButton::OnMouseEnterOrLeave(wxMouseEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

-void wxBitmapButton::OnSetBitmap()
+void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
+{
+#if wxUSE_IMAGE
+    if ( !HasFlag(wxBU_AUTODRAW) && !m_disabledSetByUser && bitmap.IsOk() )
+    {
+        m_bmpDisabled = wxBitmap(bitmap.ConvertToImage().ConvertToGreyscale());
+    }
+#endif // wxUSE_IMAGE
+
+    wxBitmapButtonBase::SetBitmapLabel(bitmap);
+}
+
+void wxBitmapButton::SetBitmapFocus(const wxBitmap& focus)

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


@@ -233,15 +217,26 @@ void wxBitmapButton::OnSetBitmap()
     // 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)
     // 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() )
-    {
+    if ( focus.Ok() && !m_hoverSetByUser )

         m_bmpHover = m_bmpFocus;
         m_bmpHover = m_bmpFocus;

-    }

 
 

-    // this will redraw us
-    wxBitmapButtonBase::OnSetBitmap();
+    wxBitmapButtonBase::SetBitmapFocus(focus);
+}
+
+void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
+{
+    if ( disabled.IsOk() )
+        m_disabledSetByUser = true;
+
+    wxBitmapButtonBase::SetBitmapDisabled(disabled);
+}
+
+void wxBitmapButton::SetBitmapHover(const wxBitmap& hover)
+{
+    if ( hover.IsOk() )
+        m_hoverSetByUser = true;
+
+    wxBitmapButtonBase::SetBitmapHover(hover);

 }
 
 #if wxUSE_UXTHEME
 }
 
 #if wxUSE_UXTHEME


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

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

         dst.DrawBitmap(*bitmap, x1, y1, true);
 
         return true;
         dst.DrawBitmap(*bitmap, x1, y1, true);
 
         return true;


@@ -583,15 +577,15 @@ wxBitmapButton::DrawButtonDisable( WXHDC dc,
     ::PatBlt( (HDC) dc, left, top, right, bottom, PATTERNPAINT);
 }
 
     ::PatBlt( (HDC) dc, left, top, right, bottom, PATTERNPAINT);
 }
 

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

 wxSize wxBitmapButton::DoGetBestSize() const
 {
     if ( m_bmpNormal.Ok() )
     {
 wxSize wxBitmapButton::DoGetBestSize() const
 {
     if ( m_bmpNormal.Ok() )
     {

+        int width = m_bmpNormal.GetWidth(),
+            height = m_bmpNormal.GetHeight();
+        int marginH = 0,
+            marginV = 0;
+

 #if wxUSE_UXTHEME
         if ( wxUxThemeEngine::GetIfActive() )
         {
 #if wxUSE_UXTHEME
         if ( wxUxThemeEngine::GetIfActive() )
         {


@@ -603,19 +597,34 @@ wxSize wxBitmapButton::DoGetBestSize() const
                                                     TMT_CONTENTMARGINS, NULL,
                                                     &margins);
 
                                                     TMT_CONTENTMARGINS, NULL,
                                                     &margins);
 

-            // the margins we get are too small, part of the bitmap is
-            // truncated if we use them -- so add a little extra space
-            wxSize best(m_bmpNormal.GetWidth() +
-                            margins.cxLeftWidth + margins.cxRightWidth + 5,
-                        m_bmpNormal.GetHeight() +
-                            margins.cyTopHeight + margins.cyBottomHeight + 5);
-            CacheBestSize(best);
-            return best;
+            // XP doesn't draw themed buttons correctly when the client area is
+            // smaller than 8x8 - enforce this minimum size for small bitmaps
+            if ( width < 8 )
+                width = 8;
+            if ( height < 8 )
+                height = 8;
+
+            // don't add margins for the borderless buttons, they don't need
+            // them and it just makes them appear larger than needed
+            if ( !HasFlag(wxBORDER_NONE) )
+            {
+                // we need 2 extra pixels for the focus rectangle, without them
+                // it's overwritten by the bitmap itself
+                marginH = margins.cxLeftWidth + margins.cxRightWidth + 2;
+                marginV = margins.cyTopHeight + margins.cyBottomHeight + 2;
+            }

         }
         }

+        else

 #endif // wxUSE_UXTHEME
 #endif // wxUSE_UXTHEME

+        {
+            if ( !HasFlag(wxBORDER_NONE) )
+            {
+                marginH = 2*m_marginX;
+                marginV = 2*m_marginY;
+            }
+        }

 
 

-        wxSize best(m_bmpNormal.GetWidth() + 2*m_marginX,
-                      m_bmpNormal.GetHeight() + 2*m_marginY);
+        wxSize best(width + marginH, height + marginV);

         CacheBestSize(best);
         return best;
     }
         CacheBestSize(best);
         return best;
     }