64 bit compilation fix for wxTextCtrl in wxMSW.

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

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index 5f95f45a58c1e338525721bff7083ed01e7a7810..5aa74bfb40b631960d6fdf100e272140a6d3f058 100644 (file)
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -1,289 +1,96 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxBitmapButton
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     wxBitmapButton
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
-#pragma implementation "bmpbuttn.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WX_PRECOMP
-    #include "wx/bmpbuttn.h"
-#endif
+#if wxUSE_BMPBUTTON

 
 

-#include "wx/msw/private.h"
+#include "wx/bmpbuttn.h"

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/dcmemory.h"
+    #include "wx/image.h"

 #endif
 
 #endif
 

-#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)
-{
-  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;
-
-  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;
-
-  if (id == -1)
-    m_windowId = NewControlId();
-  else
-    m_windowId = id;
-
-  if ( width == -1 && bitmap.Ok())
-    width = bitmap.GetWidth() + 2*m_marginX;
-
-  if ( height == -1 && bitmap.Ok())
-    height = bitmap.GetHeight() + 2*m_marginY;
-
-  m_hWnd = (WXHWND)CreateWindowEx
-                   (
-                    0,
-                    wxT("BUTTON"),
-                    wxT(""),
-                    WS_VISIBLE | WS_TABSTOP | WS_CHILD | BS_OWNERDRAW ,
-                    0, 0, 0, 0, 
-                    GetWinHwnd(parent),
-                    (HMENU)m_windowId,
-                    wxGetInstance(),
-                    NULL
-                   );
-
-  // Subclass again for purposes of dialog editing mode
-  SubclassWin(m_hWnd);
+#include "wx/msw/private.h"
+#include "wx/msw/dc.h"          // for wxDCTemp

 
 

-  SetFont(parent->GetFont()) ;
+#include "wx/msw/uxtheme.h"

 
 

-  SetSize(x, y, width, height);
+#if wxUSE_UXTHEME
+    // no need to include tmschema.h
+    #ifndef BP_PUSHBUTTON
+        #define BP_PUSHBUTTON 1

 
 

-  return TRUE;
-}
+        #define PBS_NORMAL    1
+        #define PBS_HOT       2
+        #define PBS_PRESSED   3
+        #define PBS_DISABLED  4
+        #define PBS_DEFAULTED 5

 
 

-void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
-{
-  m_buttonBitmap = bitmap;
-}
+        #define TMT_CONTENTMARGINS 3602
+    #endif
+#endif // wxUSE_UXTHEME

 
 

-bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
-{
-#if defined(__WIN95__)
-    long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);
-    if (style & BS_BITMAP)
-    {
-        // Let default procedure draw the bitmap, which is defined
-        // in the Windows resource.
-        return FALSE;
-    }
+#ifndef ODS_NOFOCUSRECT
+    #define ODS_NOFOCUSRECT     0x0200

 #endif
 
 #endif
 

-    LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item;
-
-    wxBitmap* bitmap = &m_buttonBitmap;
-
-    UINT state = lpDIS->itemState;
-    if ((state & ODS_SELECTED) && m_buttonBitmapSelected.Ok())
-        bitmap = &m_buttonBitmapSelected;
-    else if ((state & ODS_FOCUS) && m_buttonBitmapFocus.Ok())
-        bitmap = &m_buttonBitmapFocus;
-    else if ((state & ODS_DISABLED) && m_buttonBitmapDisabled.Ok())
-        bitmap = &m_buttonBitmapDisabled;
-
-    if ( !bitmap->Ok() )
-        return FALSE;
-
-    HDC hDC = lpDIS->hDC;
-    HDC memDC = ::CreateCompatibleDC(hDC);
-
-    HBITMAP old = (HBITMAP) ::SelectObject(memDC, (HBITMAP) bitmap->GetHBITMAP());
-
-    if (!old)
-        return FALSE;
-
-    int x = lpDIS->rcItem.left;
-    int y = lpDIS->rcItem.top;
-    int width = lpDIS->rcItem.right - x;
-    int height = lpDIS->rcItem.bottom - y;
-
-    // Draw the face, if auto-drawing
-    if ( GetWindowStyleFlag() & wxBU_AUTODRAW )
-        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));
-
-    if ( (state & ODS_SELECTED) && (GetWindowStyleFlag() & wxBU_AUTODRAW) )
-    {
-        x1 ++;
-        y1 ++;
-    }
-
-    wxMask *mask = bitmap->GetMask();
-    if ( mask )
-    {
-        ::MaskBlt(hDC, x1, y1, bitmap->GetWidth(), bitmap->GetHeight(), // dst
-                  memDC, 0, 0,                                          // src
-                  (HBITMAP)mask->GetMaskBitmap(), 0, 0,                 // mask
-                  MAKEROP4(SRCPAINT, SRCCOPY));
-    }
-    else
-    {
-        ::BitBlt(hDC, x1, y1, bitmap->GetWidth(), bitmap->GetHeight(), // dst
-                 memDC, 0, 0,                                          // src
-                 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));
-
-    ::SelectObject(memDC, old);
-
-    ::DeleteDC(memDC);
-
-    return TRUE;
-}
-
-void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel )
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase)
+    EVT_SYS_COLOUR_CHANGED(wxBitmapButton::OnSysColourChanged)
+END_EVENT_TABLE()
+
+/*
+TODO PROPERTIES :
+
+long "style" , wxBU_AUTODRAW
+bool "default" , 0
+bitmap "selected" ,
+bitmap "focus" ,
+bitmap "disabled" ,
+*/
+
+bool wxBitmapButton::Create(wxWindow *parent,
+                            wxWindowID id,
+                            const wxBitmap& bitmap,
+                            const wxPoint& pos,
+                            const wxSize& size, long style,
+                            const wxValidator& validator,
+                            const wxString& name)

 {
 {

-  HPEN  oldp;
-  HBRUSH    oldb ;
-
-  HPEN penBorder;
-  HPEN penLight;
-  HPEN penShadow;
-  HBRUSH brushFace;
-  COLORREF 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_BTNHIGHLIGHT) ;
-    penLight = CreatePen(PS_SOLID,0,ms_color) ;
+    if ( !wxBitmapButtonBase::Create(parent, id, pos, size, style,
+                                     validator, name) )
+        return false;

 
 

-    ms_color = GetSysColor(COLOR_BTNFACE) ;
-    brushFace = CreateSolidBrush(ms_color) ;
+    if ( bitmap.IsOk() )
+        SetBitmapLabel(bitmap);

 
 

-    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
+    if ( !size.IsFullySpecified() )

     {
     {

-        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) ;
+        // As our bitmap has just changed, our best size has changed as well so
+        // reset the initial size using the new value.
+        SetInitialSize(size);

     }
     }

-    SelectObject((HDC) dc,oldp) ;
-    SelectObject((HDC) dc,oldb) ;

 
 

-  DeleteObject(penBorder);
-  DeleteObject(penLight);
-  DeleteObject(penShadow);
-  DeleteObject(brushFace);
-}
-
-// VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN
-#define FOCUS_MARGIN 3
-
-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 ) ;
+    return true;

 }
 
 }
 

-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,
-#ifdef __SALFORDC__
-                0xfa0089L ) ;
-#else
-                0xfa0089UL ) ;
-#endif
-    else    ::PatBlt( (HDC) dc, left, top, right, bottom,
-#ifdef __SALFORDC__
-       0xfa0089L ) ;
-#else
-       0xfa0089UL ) ;
-#endif
-    ::SelectObject( (HDC) dc, old ) ;
-}
-
-void wxBitmapButton::SetDefault()
-{
-    wxButton::SetDefault();
-}
+#endif // wxUSE_BMPBUTTON