Fix recreating of wxBitmapComboBox using untyped client data.

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

diff --git a/src/os2/bmpbuttn.cpp b/src/os2/bmpbuttn.cpp
index 169f0d557acb5b622fb9b5e60c0755b8a8a3ee89..57b654bc45a481c8e2daadf571614be83bc10268 100644 (file)
--- a/src/os2/bmpbuttn.cpp
+++ b/src/os2/bmpbuttn.cpp
@@ -1,65 +1,299 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxBitmapButton
 // Purpose:     wxBitmapButton

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
-// RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Created:     10/13/99
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "bmpbuttn.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_BMPBUTTON

 
 #include "wx/bmpbuttn.h"
 
 
 #include "wx/bmpbuttn.h"
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
+#ifndef WX_PRECOMP

 #endif
 
 #endif
 

-bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
-           const wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
+#include "wx/os2/dcclient.h"
+#include "wx/os2/private.h"
+
+
+#define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
+
+bool wxBitmapButton::Create( wxWindow*          pParent,
+                             wxWindowID         vId,
+                             const wxBitmap&    rBitmap,
+                             const wxPoint&     rPos,
+                             const wxSize&      rSize,
+                             long               lStyle,
+                             const wxValidator& rValidator,
+                             const wxString&    rsName )

 {
 {

-    m_buttonBitmap = bitmap;
-    SetName(name);
-    SetValidator(validator);
-    parent->AddChild(this);
-
-    m_backgroundColour = parent->GetBackgroundColour() ;
-    m_foregroundColour = parent->GetForegroundColour() ;
-    m_windowStyle = style;
-    m_marginX = 0;
-    m_marginY = 0;
-
-    int x = pos.x;
-    int y = pos.y;
-    int width = size.x;
-    int height = size.y;
-
-    if (id == -1)
+    m_bitmaps[State_Normal] = rBitmap;
+    SetName(rsName);
+#if wxUSE_VALIDATORS
+    SetValidator(rValidator);
+#endif
+
+    pParent->AddChild(this);
+
+    m_backgroundColour = pParent->GetBackgroundColour() ;
+    m_foregroundColour = pParent->GetForegroundColour() ;
+    m_windowStyle = lStyle;
+
+    if (lStyle & wxBU_AUTODRAW)
+    {
+        m_marginX = wxDEFAULT_BUTTON_MARGIN;
+        m_marginY = wxDEFAULT_BUTTON_MARGIN;
+    }
+
+    int nX      = rPos.x;
+    int nY      = rPos.y;
+    int nWidth  = rSize.x;
+    int nHeight = rSize.y;
+
+    if (vId == wxID_ANY)

         m_windowId = NewControlId();
     else
         m_windowId = NewControlId();
     else

-        m_windowId = id;
+        m_windowId = vId;
+
+    if (nWidth == wxDefaultCoord && rBitmap.IsOk())
+        nWidth = rBitmap.GetWidth() + 4 * m_marginX;
+
+    if (nHeight == wxDefaultCoord && rBitmap.IsOk())
+        nHeight = rBitmap.GetHeight() + 4 * m_marginY;
+
+    ULONG                           ulOS2Style = WS_VISIBLE | WS_TABSTOP | BS_USERBUTTON;
+
+    if (m_windowStyle & wxCLIP_SIBLINGS)
+        ulOS2Style |= WS_CLIPSIBLINGS;
+
+    m_hWnd = (WXHWND)::WinCreateWindow( GetHwndOf(pParent)
+                                       ,WC_BUTTON
+                                       ,(PSZ)wxEmptyString
+                                       ,ulOS2Style
+                                       ,0, 0, 0, 0
+                                       ,GetHwndOf(pParent)
+                                       ,HWND_TOP
+                                       ,m_windowId
+                                       ,NULL
+                                       ,NULL
+                                      );
+
+    //
+    //Subclass again for purposes of dialog editing mode
+    //
+    SubclassWin(m_hWnd);
+    SetFont(*wxSMALL_FONT);
+    SetSize( nX
+            ,nY
+            ,nWidth
+            ,nHeight
+           );
+    return true;
+} // end of wxBitmapButton::Create
+
+bool wxBitmapButton::OS2OnDraw( WXDRAWITEMSTRUCT* pItem)
+{
+    PUSERBUTTON  pUser     = (PUSERBUTTON)pItem;
+    bool         bAutoDraw = (GetWindowStyleFlag() & wxBU_AUTODRAW) != 0;
+
+    if (!pUser)
+        return false;
+
+    wxBitmap   bitmap;
+    bool       bIsSelected = pUser->fsState & BDS_HILITED;
+    wxClientDC vDc(this);
+
+    if (bIsSelected)
+        bitmap = GetBitmapPressed();
+    else if (pUser->fsState & BDS_DEFAULT)
+        bitmap = GetBitmapFocus();
+    else if (pUser->fsState & BDS_DISABLED)
+        bitmap = GetBitmapDisabled();
+
+    if (!bitmap.IsOk() )
+    {
+        bitmap = GetBitmapLabel();
+        if (!bitmap.IsOk() )
+            return false;
+    }
+
+
+    //
+    // Centre the bitmap in the control area
+    //
+    int                             nX1        = 0;
+    int                             nY1        = 0;
+    wxPMDCImpl                      *impl = (wxPMDCImpl*) vDc.GetImpl();
+    int                             nWidth     = impl->m_vRclPaint.xRight - impl->m_vRclPaint.xLeft;
+    int                             nHeight    = impl->m_vRclPaint.yTop - impl->m_vRclPaint.yBottom;
+    int                             nBmpWidth  = bitmap.GetWidth();
+    int                             nBmpHeight = bitmap.GetHeight();
+
+    nX1 = (nWidth - nBmpWidth) / 2;
+    nY1 = (nHeight - nBmpHeight) / 2;
+
+    if (bIsSelected && bAutoDraw)
+    {
+        nX1++;
+        nY1++;
+    }

 
 

-    if ( width == -1 && bitmap.Ok())
-       width = bitmap.GetWidth() + 2*m_marginX;
+    //
+    // Draw the button face
+    //
+    DrawFace( vDc, bIsSelected );

 
 

-    if ( height == -1 && bitmap.Ok())
-       height = bitmap.GetHeight() + 2*m_marginY;
+    //
+    // Draw the bitmap
+    //
+    vDc.DrawBitmap( bitmap, nX1, nY1, true );

 
 

-    /* TODO: create bitmap button
-     */
+    //
+    // Draw focus / disabled state, if auto-drawing
+    //
+    if ((pUser->fsState == BDS_DISABLED) && bAutoDraw)
+    {
+        DrawButtonDisable( vDc, bitmap );
+    }
+    else if ((pUser->fsState == BDS_DEFAULT) && bAutoDraw)
+    {
+        DrawButtonFocus(vDc);
+    }
+    return true;
+} // end of wxBitmapButton::OS2OnDraw

 
 

-    return FALSE;
-}
+void wxBitmapButton::DrawFace (wxClientDC& rDC, bool bSel)
+{
+    //
+    // Set up drawing colors
+    //
+    wxPen vHiLitePen(*wxWHITE, 2, wxSOLID); // White
+    wxColour gray85(85, 85, 85);
+    wxPen vDarkShadowPen(gray85, 2, wxSOLID);
+    wxColour vFaceColor(204, 204, 204); // Light Grey
+
+    //
+    // Draw the main button face
+    //
+    // This triggers a redraw and destroys the bottom & left focus border and
+    // doesn't seem to do anything useful.
+    //    ::WinFillRect(rDC.GetHPS(), &rDC.m_vRclPaint, vFaceColor.GetPixel());
+
+    //
+    // Draw the border
+    // Note: DrawLine expects wxWidgets coordinate system so swap
+    //
+    rDC.SetPen(bSel ? vDarkShadowPen : vHiLitePen);
+    wxPMDCImpl                      *impl = (wxPMDCImpl*) rDC.GetImpl();
+    // top
+    rDC.DrawLine( impl->m_vRclPaint.xLeft + 1
+                 ,impl->m_vRclPaint.yBottom + 1
+                 ,impl->m_vRclPaint.xRight - 1
+                 ,impl->m_vRclPaint.yBottom + 1
+                );
+    // left
+    rDC.DrawLine( impl->m_vRclPaint.xLeft + 1
+                 ,impl->m_vRclPaint.yBottom + 1
+                 ,impl->m_vRclPaint.xLeft + 1
+                 ,impl->m_vRclPaint.yTop - 1
+                );
+
+    rDC.SetPen(bSel ? vHiLitePen : vDarkShadowPen);
+    // bottom
+    rDC.DrawLine( impl->m_vRclPaint.xLeft + 1
+                 ,impl->m_vRclPaint.yTop - 1
+                 ,impl->m_vRclPaint.xRight - 1
+                 ,impl->m_vRclPaint.yTop - 1
+                );
+    // right
+    rDC.DrawLine( impl->m_vRclPaint.xRight - 1
+                 ,impl->m_vRclPaint.yBottom + 1
+                 ,impl->m_vRclPaint.xRight - 1
+                 ,impl->m_vRclPaint.yTop - 1
+                );
+
+} // end of wxBitmapButton::DrawFace

 
 

-void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
+void wxBitmapButton::DrawButtonFocus (
+  wxClientDC&                       rDC
+)

 {
 {

-    m_buttonBitmap = bitmap;
-}
+    wxPen vBlackPen(*wxBLACK, 2, wxSOLID);
+
+    //
+    // Draw a thick black line around the outside of the button
+    // Note: DrawLine expects wxWidgets coordinate system so swap
+    //
+    rDC.SetPen(vBlackPen);
+    wxPMDCImpl                      *impl = (wxPMDCImpl*) rDC.GetImpl();
+    // top
+    rDC.DrawLine( impl->m_vRclPaint.xLeft
+                 ,impl->m_vRclPaint.yBottom
+                 ,impl->m_vRclPaint.xRight
+                 ,impl->m_vRclPaint.yBottom
+                );
+    // right
+    rDC.DrawLine( impl->m_vRclPaint.xRight
+                 ,impl->m_vRclPaint.yBottom
+                 ,impl->m_vRclPaint.xRight
+                 ,impl->m_vRclPaint.yTop
+                );
+    // bottom
+    rDC.DrawLine( impl->m_vRclPaint.xRight
+                 ,impl->m_vRclPaint.yTop
+                 ,impl->m_vRclPaint.xLeft
+                 ,impl->m_vRclPaint.yTop
+                );
+    // left
+    rDC.DrawLine( impl->m_vRclPaint.xLeft
+                 ,impl->m_vRclPaint.yTop
+                 ,impl->m_vRclPaint.xLeft
+                 ,impl->m_vRclPaint.yBottom
+                );
+} // end of wxBitmapButton::DrawButtonFocus
+
+void wxBitmapButton::DrawButtonDisable( wxClientDC& rDC,
+                                        wxBitmap& rBmp )
+{
+    wxPen vGreyPen(wxT("GREY"), 2, wxSOLID);
+
+    //
+    // Draw a thick black line around the outside of the button
+    // Note: DrawLine expects wxWidgets coordinate system so swap
+    //
+    rDC.SetPen(vGreyPen);
+    wxPMDCImpl                      *impl = (wxPMDCImpl*) rDC.GetImpl();
+    // top
+    rDC.DrawLine( impl->m_vRclPaint.xLeft
+                 ,impl->m_vRclPaint.yBottom
+                 ,impl->m_vRclPaint.xRight
+                 ,impl->m_vRclPaint.yBottom
+                );
+    // right
+    rDC.DrawLine( impl->m_vRclPaint.xRight
+                 ,impl->m_vRclPaint.yBottom
+                 ,impl->m_vRclPaint.xRight
+                 ,impl->m_vRclPaint.yTop
+                );
+    // bottom
+    rDC.DrawLine( impl->m_vRclPaint.xRight
+                 ,impl->m_vRclPaint.yTop
+                 ,impl->m_vRclPaint.xLeft
+                 ,impl->m_vRclPaint.yTop
+                );
+    // left
+    rDC.DrawLine( impl->m_vRclPaint.xLeft
+                 ,impl->m_vRclPaint.yTop
+                 ,impl->m_vRclPaint.xLeft
+                 ,impl->m_vRclPaint.yBottom
+                );
+    wxDisableBitmap(rBmp, vGreyPen.GetColour().GetPixel());
+} // end of wxBitmapButton::DrawButtonDisable

 
 

+#endif // ndef for wxUSE_BMPBUTTON