Applied patch [ 1374215 ] Bug fix to wxSpinCtrl for Windows

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

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 980476bfdece67f4bf4b2bc49e156a8338c54546..f1f3fcee47e5858ad6132aaa17ba7b32c7481d14 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -5,196 +5,302 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // 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 "statbmp.h"
-#endif
+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------

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

+#if wxUSE_STATBMP
+
+#include "wx/window.h"
+#include "wx/msw/private.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/statbmp.h"
+    #include "wx/icon.h"
+    #include "wx/statbmp.h"

 #endif
 
 #endif
 

+#include "wx/sysopt.h"
+

 #include <stdio.h>
 #include <stdio.h>

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

 
 

-#if !USE_SHARED_LIBRARY
+// ---------------------------------------------------------------------------
+// macors
+// ---------------------------------------------------------------------------
+
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxStaticBitmapStyle )
+
+wxBEGIN_FLAGS( wxStaticBitmapStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    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
+    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
+    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)
+
+wxEND_FLAGS( wxStaticBitmapStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBitmap, wxControl,"wx/statbmp.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxStaticBitmap)
+    wxPROPERTY_FLAGS( WindowStyle , wxStaticBitmapStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxStaticBitmap)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxStaticBitmap, wxWindow* , Parent , wxWindowID , Id , wxBitmap, Bitmap, wxPoint , Position , wxSize , Size )
+
+#else

 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 #endif
 
 /*
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 #endif
 
 /*

- * wxStaticBitmap
- */
-
-bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
-           const wxBitmap& bitmap,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+    TODO PROPERTIES :
+        bitmap
+*/
+
+// ===========================================================================
+// implementation
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// wxStaticBitmap
+// ---------------------------------------------------------------------------
+
+// we may have either bitmap or icon: if a bitmap with mask is passed, we
+// will transform it to an icon ourselves because otherwise the mask will
+// be ignored by Windows
+// note that this function will create a new object every time
+// it is called even if the image needs no conversion
+
+static wxGDIImage* ConvertImage( const wxGDIImage& bitmap )

 {
 {

-  m_messageBitmap = bitmap;
-  SetName(name);
-  if (parent) parent->AddChild(this);
-
-  m_backgroundColour = parent->GetBackgroundColour() ;
-  m_foregroundColour = parent->GetForegroundColour() ;
-
-  if ( id == -1 )
-    m_windowId = (int)NewControlId();
-  else
-    m_windowId = id;
-
-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
-
-  if ( width < 0 && bitmap.Ok() )
-    width = bitmap.GetWidth();
-  if ( height < 0 && bitmap.Ok() )
-    height = bitmap.GetHeight();
-
-  m_windowStyle = style;
-
-  // Use an ownerdraw button to produce a static bitmap, since there's
-  // no ownerdraw static.
-  // TODO: perhaps this should be a static item, with style SS_BITMAP.
-  m_hWnd = (WXHWND)CreateWindow
-           (
-            "BUTTON",
-            "",
-            BS_OWNERDRAW | WS_TABSTOP | WS_CHILD | WS_VISIBLE,
-            0, 0, 0, 0,
-            (HWND)parent->GetHWND(),
-            (HMENU)m_windowId,
-            wxGetInstance(),
-            NULL
-           );
-
-  // Subclass again for purposes of dialog editing mode
-  SubclassWin(m_hWnd);
-
-  SetFont(GetParent()->GetFont());
-
-  SetSize(x, y, width, height);
-  return TRUE;
+    bool isIcon = bitmap.IsKindOf( CLASSINFO(wxIcon) );
+
+    if( !isIcon )
+    {
+        wxASSERT_MSG( wxDynamicCast(&bitmap, wxBitmap),
+                      _T("not an icon and not a bitmap?") );
+
+        const wxBitmap& bmp = (const wxBitmap&)bitmap;
+        wxMask *mask = bmp.GetMask();
+        if ( mask && mask->GetMaskBitmap() )
+        {
+            wxIcon* icon = new wxIcon;
+            icon->CopyFromBitmap(bmp);
+
+            return icon;
+        }
+
+        return new wxBitmap( bmp );
+    }
+
+    // copying a bitmap is a cheap operation
+    return new wxIcon( (const wxIcon&)bitmap );

 }
 
 }
 

-void wxStaticBitmap::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+bool wxStaticBitmap::Create(wxWindow *parent,
+                            wxWindowID id,
+                            const wxGDIImage& bitmap,
+                            const wxPoint& pos,
+                            const wxSize& size,
+                            long style,
+                            const wxString& name)

 {
 {

-  int currentX, currentY;
-  GetPosition(&currentX, &currentY);
-  int x1 = x;
-  int y1 = y;
-
-  if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    x1 = currentX;
-  if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    y1 = currentY;
+    if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
+        return false;

 
 

-  AdjustForParentClientOrigin(x1, y1, sizeFlags);
+    // we may have either bitmap or icon: if a bitmap with mask is passed, we
+    // will transform it to an icon ourselves because otherwise the mask will
+    // be ignored by Windows
+    m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));

 
 

-  int actualWidth = width;
-  int actualHeight = height;
+    wxGDIImage *image = ConvertImage( bitmap );
+    m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );

 
 

-  int ww, hh;
-  GetSize(&ww, &hh);
+    // create the native control
+    if ( !MSWCreateControl(_T("STATIC"), wxEmptyString, pos, size) )
+    {
+        // control creation failed
+        return false;
+    }

 
 

-  // If we're prepared to use the existing width, then...
-  if (width == -1 && ((sizeFlags & wxSIZE_AUTO_WIDTH) != wxSIZE_AUTO_WIDTH))
-    actualWidth = ww;
-  else actualWidth = width;
+    // no need to delete the new image
+    SetImageNoCopy(image);

 
 

-  // If we're prepared to use the existing height, then...
-  if (height == -1 && ((sizeFlags & wxSIZE_AUTO_HEIGHT) != wxSIZE_AUTO_HEIGHT))
-    actualHeight = hh;
-  else actualHeight = height;
+    // GetBestSize will work properly now, so set the best size if needed
+    SetBestSize(size);

 
 

-  MoveWindow((HWND) GetHWND(), x1, y1, actualWidth, actualHeight, TRUE);
+    return true;

 }
 
 }
 

-void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
+wxBorder wxStaticBitmap::GetDefaultBorder() const

 {
 {

-  m_messageBitmap = bitmap;
-
-  int x, y;
-  int w, h;
-  GetPosition(&x, &y);
-  GetSize(&w, &h);
-  RECT rect;
-  rect.left = x; rect.top = y; rect.right = x + w; rect.bottom = y + h;
-
-  if ( bitmap.Ok() )
-    MoveWindow((HWND) GetHWND(), x, y, bitmap.GetWidth(), bitmap.GetHeight(),
-             FALSE);
-  
-  InvalidateRect((HWND) GetParent()->GetHWND(), &rect, TRUE);
+    return wxBORDER_NONE;

 }
 
 }
 

-bool wxStaticBitmap::MSWOnDraw(WXDRAWITEMSTRUCT *item)
+WXDWORD wxStaticBitmap::MSWGetStyle(long style, WXDWORD *exstyle) const

 {
 {

-    long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);
-#if defined(__WIN32__) && defined(SS_BITMAP)
-    if ((style & 0xFF) == SS_BITMAP)
-    {
-        // Should we call Default() here?
-//      Default();
+    WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);

 
 

-        // Let default procedure draw the bitmap, which is defined
-        // in the Windows resource.
-        return FALSE;
-    }
-#endif
+    // what kind of control are we?
+    msStyle |= m_isIcon ? SS_ICON : SS_BITMAP;
+
+    // we use SS_CENTERIMAGE to prevent the control from resizing the bitmap to
+    // fit to its size -- this is unexpected and doesn't happen in other ports
+    //
+    // and SS_NOTIFY is necessary to receive mouse events
+    msStyle |= SS_CENTERIMAGE | SS_NOTIFY;

 
 

-    LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item;
+    return msStyle;
+}

 
 

-    wxBitmap* bitmap = &m_messageBitmap;
-    if ( !bitmap->Ok() )
-        return FALSE;
+bool wxStaticBitmap::ImageIsOk() const
+{
+    return m_image && m_image->Ok();
+}

 
 

-    HDC hDC = lpDIS->hDC;
-    HDC memDC = ::CreateCompatibleDC(hDC);
+wxIcon wxStaticBitmap::GetIcon() const
+{
+    wxCHECK_MSG( m_image, wxIcon(), _T("no image in wxStaticBitmap") );

 
 

-    HBITMAP old = (HBITMAP) ::SelectObject(memDC, (HBITMAP) bitmap->GetHBITMAP());
+    // we can't ask for an icon if all we have is a bitmap
+    wxCHECK_MSG( m_isIcon, wxIcon(), _T("no icon in this wxStaticBitmap") );

 
 

-    if (!old)
-        return FALSE;
+    return *(wxIcon *)m_image;
+}

 
 

-       int x = lpDIS->rcItem.left;
-       int y = lpDIS->rcItem.top;
-       int width = lpDIS->rcItem.right - x;
-       int height = lpDIS->rcItem.bottom - y;
+wxBitmap wxStaticBitmap::GetBitmap() const
+{
+    if ( m_isIcon )
+    {
+        // don't fail because we might have replaced the bitmap with icon
+        // ourselves internally in ConvertImage() to keep the transparency but
+        // the user code doesn't know about it so it still can use GetBitmap()
+        // to retrieve the bitmap
+        return wxBitmap(GetIcon());
+    }
+    else // we have a bitmap
+    {
+        wxCHECK_MSG( m_image, wxBitmap(), _T("no image in wxStaticBitmap") );

 
 

-    // Centre the bitmap in the control area
-    int x1 = (int) (x + ((width - bitmap->GetWidth()) / 2));
-    int y1 = (int) (y + ((height - bitmap->GetHeight()) / 2));
+        return *(wxBitmap *)m_image;
+    }
+}

 
 

-    ::BitBlt(hDC, x1, y1, bitmap->GetWidth(), bitmap->GetHeight(), memDC, 0, 0, SRCCOPY);
+void wxStaticBitmap::Free()
+{
+    delete m_image;

 
 

-    ::SelectObject(memDC, old);
+    m_image = NULL;
+}

 
 

-    ::DeleteDC(memDC);
+wxSize wxStaticBitmap::DoGetBestSize() const
+{
+    if ( ImageIsOk() )
+    {
+        wxSize best(m_image->GetWidth(), m_image->GetHeight());
+        CacheBestSize(best);
+        return best;
+    }

 
 

-    return TRUE;
+    // this is completely arbitrary
+    return wxSize(16, 16);
+}
+
+void wxStaticBitmap::SetImage( const wxGDIImage* image )
+{
+    wxGDIImage* convertedImage = ConvertImage( *image );
+    SetImageNoCopy( convertedImage );
+    InvalidateBestSize();

 }
 
 }
 

-long wxStaticBitmap::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)

 {
 {

-  // Ensure that static items get messages. Some controls don't like this
-  // message to be intercepted (e.g. RichEdit), hence the tests.
-  if (nMsg == WM_NCHITTEST)
-    return (long)HTCLIENT;
+    Free();
+
+    m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
+    // the image has already been copied
+    m_image = image;
+
+    int x, y;
+    int w, h;
+    GetPosition(&x, &y);
+    GetSize(&w, &h);
+
+#ifdef __WIN32__
+    HANDLE handle = (HANDLE)m_image->GetHandle();
+    LONG style = ::GetWindowLong( (HWND)GetHWND(), GWL_STYLE ) ;
+    ::SetWindowLong( (HWND)GetHWND(), GWL_STYLE, ( style & ~( SS_BITMAP|SS_ICON ) ) |
+                     ( m_isIcon ? SS_ICON : SS_BITMAP ) );
+    HGDIOBJ oldHandle = (HGDIOBJ)::SendMessage(GetHwnd(), STM_SETIMAGE,
+                  m_isIcon ? IMAGE_ICON : IMAGE_BITMAP, (LPARAM)handle);
+    // detect if this is still the handle we passed before or
+    // if the static-control made a copy of the bitmap!
+    if (m_currentHandle != 0 && oldHandle != m_currentHandle)
+    {
+        // the static control made a copy and we are responsible for deleting it
+        DeleteObject(oldHandle);      
+    }
+    m_currentHandle = (HGDIOBJ)handle;                         
+#endif // Win32
+
+    if ( ImageIsOk() )
+    {
+        int width = image->GetWidth(),
+            height = image->GetHeight();
+        if ( width && height )
+        {
+            w = width;
+            h = height;
+
+            ::MoveWindow(GetHwnd(), x, y, width, height, FALSE);
+        }
+    }

 
 

-  return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
+    RECT rect;
+    rect.left   = x;
+    rect.top    = y;
+    rect.right  = x + w;
+    rect.bottom = y + h;
+    ::InvalidateRect(GetHwndOf(GetParent()), &rect, TRUE);

 }
 
 }
 

+#endif // wxUSE_STATBMP
+