X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d17ee60a5a7101437baa08b68201879d0504400..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/msw/statbmp.cpp?ds=sidebyside

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index a584ebac96..61d7b01e76 100644
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -38,6 +38,8 @@
     #include "wx/statbmp.h"
 #endif
 
+#include "wx/sysopt.h"
+
 #include <stdio.h>
 
 // ---------------------------------------------------------------------------
@@ -56,7 +58,7 @@ wxBEGIN_FLAGS( wxStaticBitmapStyle )
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)
-    
+
     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)
@@ -80,7 +82,7 @@ wxEND_FLAGS( wxStaticBitmapStyle )
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBitmap, wxControl,"wx/statbmp.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxStaticBitmap)
-    wxPROPERTY_FLAGS( WindowStyle , wxStaticBitmapStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+    wxPROPERTY_FLAGS( WindowStyle , wxStaticBitmapStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
 wxEND_PROPERTIES_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxStaticBitmap)
@@ -93,8 +95,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 #endif
 
 /*
-	TODO PROPERTIES :
-		bitmap
+    TODO PROPERTIES :
+        bitmap
 */
 
 // ===========================================================================
@@ -146,15 +148,14 @@ bool wxStaticBitmap::Create(wxWindow *parent,
                             const wxString& name)
 {
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
-        return FALSE;
+        return false;
 
     // 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
-    wxGDIImage *image = (wxGDIImage *)NULL;
     m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));
 
-    image = ConvertImage( bitmap );
+    wxGDIImage *image = ConvertImage( bitmap );
     m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
 
     // create the native control
@@ -169,8 +170,8 @@ bool wxStaticBitmap::Create(wxWindow *parent,
 
     // GetBestSize will work properly now, so set the best size if needed
     SetBestSize(size);
-    
-    return TRUE;
+
+    return true;
 }
 
 wxBorder wxStaticBitmap::GetDefaultBorder() const
@@ -207,7 +208,11 @@ void wxStaticBitmap::Free()
 wxSize wxStaticBitmap::DoGetBestSize() const
 {
     if ( ImageIsOk() )
-        return wxSize(m_image->GetWidth(), m_image->GetHeight());
+    {
+        wxSize best(m_image->GetWidth(), m_image->GetHeight());
+        CacheBestSize(best);
+        return best;
+    }
 
     // this is completely arbitrary
     return wxSize(16, 16);
@@ -217,6 +222,7 @@ void wxStaticBitmap::SetImage( const wxGDIImage* image )
 {
     wxGDIImage* convertedImage = ConvertImage( *image );
     SetImageNoCopy( convertedImage );
+    InvalidateBestSize();
 }
 
 void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
@@ -259,22 +265,31 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
     rect.top    = y;
     rect.right  = x + w;
     rect.bottom = y + h;
-    InvalidateRect(GetHwndOf(GetParent()), &rect, TRUE);
+    ::InvalidateRect(GetHwndOf(GetParent()), &rect, TRUE);
 }
 
-// We need this or the control can never be moved e.g. in Dialog Editor.
 WXLRESULT wxStaticBitmap::MSWWindowProc(WXUINT nMsg,
                                    WXWPARAM wParam,
                                    WXLPARAM lParam)
 {
 #ifndef __WXWINCE__
-    // 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;
+    static int s_useHTClient = -1;
+    if (s_useHTClient == -1)
+        s_useHTClient = wxSystemOptions::GetOptionInt(wxT("msw.staticbitmap.htclient"));
+    if (s_useHTClient == 1)
+    {
+        // Ensure that static items get messages. Some controls don't like this
+        // message to be intercepted (e.g. RichEdit), hence the tests.
+        // Also, this code breaks some other processing such as enter/leave tracking
+        // so it's off by default.
+        
+        if ( nMsg == WM_NCHITTEST )
+            return (long)HTCLIENT;
+    }
 #endif
 
     return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }
 
 #endif // wxUSE_STATBMP
+