Compilation fir for VC6 after r73124.

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

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 31c46938b82515edb8dfd91211fc101a5b77dd3b..469d3e68c45a4b280e85b479fda9130e8957089c 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -61,7 +61,7 @@
 
 static wxGDIImage* ConvertImage( const wxGDIImage& bitmap )
 {
 
 static wxGDIImage* ConvertImage( const wxGDIImage& bitmap )
 {

-    bool isIcon = bitmap.IsKindOf( CLASSINFO(wxIcon) );
+    bool isIcon = bitmap.IsKindOf( wxCLASSINFO(wxIcon) );

 
     if( !isIcon )
     {
 
     if( !isIcon )
     {


@@ -99,10 +99,10 @@ bool wxStaticBitmap::Create(wxWindow *parent,
     // 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
     // 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));
+    m_isIcon = bitmap.IsKindOf(wxCLASSINFO(wxIcon));

 
     wxGDIImage *image = ConvertImage( bitmap );
 
     wxGDIImage *image = ConvertImage( bitmap );

-    m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
+    m_isIcon = image->IsKindOf( wxCLASSINFO(wxIcon) );

 
     // create the native control
     if ( !MSWCreateControl(wxT("STATIC"), wxEmptyString, pos, size) )
 
     // create the native control
     if ( !MSWCreateControl(wxT("STATIC"), wxEmptyString, pos, size) )


@@ -189,17 +189,21 @@ void wxStaticBitmap::Free()
     wxDELETE(m_image);
 }
 
     wxDELETE(m_image);
 }
 

-wxSize wxStaticBitmap::DoGetBestSize() const
+wxSize wxStaticBitmap::DoGetBestClientSize() const

 {
 {

+    wxSize size;

     if ( ImageIsOk() )
     {
     if ( ImageIsOk() )
     {

-        wxSize best(m_image->GetWidth(), m_image->GetHeight());
-        CacheBestSize(best);
-        return best;
+        size = m_image->GetSize();
+    }
+    else // No image yet
+    {
+        // this is completely arbitrary
+        size.x =
+        size.y = 16;

     }
 
     }
 

-    // this is completely arbitrary
-    return wxSize(16, 16);
+    return size;

 }
 
 #ifndef __WXWINCE__
 }
 
 #ifndef __WXWINCE__


@@ -232,14 +236,14 @@ void wxStaticBitmap::SetImage( const wxGDIImage* image )
 {
     wxGDIImage* convertedImage = ConvertImage( *image );
     SetImageNoCopy( convertedImage );
 {
     wxGDIImage* convertedImage = ConvertImage( *image );
     SetImageNoCopy( convertedImage );

-    InvalidateBestSize();

 }
 
 void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
 {
     Free();
 }
 
 void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
 {
     Free();

+    InvalidateBestSize();

 
 

-    m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
+    m_isIcon = image->IsKindOf( wxCLASSINFO(wxIcon) );

     // the image has already been copied
     m_image = image;
 
     // the image has already been copied
     m_image = image;