Warning fixes for win64

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

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 86fda57454ec9392b4ca1e02c1d213757942cdaf..fbdba6ccc56cb263ac907cc5ec178aed90b7dcd1 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "statbmp.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -38,6 +34,8 @@
     #include "wx/statbmp.h"
 #endif
 
+#include "wx/sysopt.h"
+
 #include <stdio.h>
 
 // ---------------------------------------------------------------------------
@@ -56,7 +54,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)
@@ -93,8 +91,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 #endif
 
 /*
-       TODO PROPERTIES :
-               bitmap
+    TODO PROPERTIES :
+        bitmap
 */
 
 // ===========================================================================
@@ -146,15 +144,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 +166,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
@@ -187,7 +184,9 @@ WXDWORD wxStaticBitmap::MSWGetStyle(long style, WXDWORD *exstyle) const
 
     // 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
-    msStyle |= SS_CENTERIMAGE;
+    //
+    // and SS_NOTIFY is necessary to receive mouse events
+    msStyle |= SS_CENTERIMAGE | SS_NOTIFY;
 
     return msStyle;
 }
@@ -207,7 +206,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);
@@ -260,22 +263,8 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
     rect.top    = y;
     rect.right  = x + w;
     rect.bottom = y + h;
-    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;
-#endif
-
-    return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
+    ::InvalidateRect(GetHwndOf(GetParent()), &rect, TRUE);
 }
 
 #endif // wxUSE_STATBMP
+