wxWindow::GetBestSize() added

[wxWidgets.git] / src / common / imagbmp.cpp

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index dca81ce5fc9bc51d40aeab326bc5b1481d6defc2..52dade70e42264231a62c40ebddc439b5708b889 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -366,7 +366,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
                    ptr[poffset] = temp;
                    temp = (aWord & gmask) >> gshift;
                    ptr[poffset + 1] = temp;
-                   temp = (aWord & bmask) >> gshift;
+                   temp = (aWord & bmask) >> bshift;
                    ptr[poffset + 2] = temp;
                    column++;
                }
@@ -401,10 +401,10 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
      return TRUE;
 }
 
-bool wxBMPHandler::CanRead( wxInputStream& stream )
+bool wxBMPHandler::DoCanRead( wxInputStream& stream )
 {
     unsigned char hdr[2];
-    
+
     stream.Read(&hdr, 2);
     stream.SeekI(-2, wxFromCurrent);
     return (hdr[0] == 'B' && hdr[1] == 'M');