fix warnings (double to int conversions and unused variables); removed hard TABs...

[wxWidgets.git] / src / mac / classic / bitmap.cpp

diff --git a/src/mac/classic/bitmap.cpp b/src/mac/classic/bitmap.cpp
index d91980f7f8f1f7813933faf55e9f1687f5da2e15..768b729616f0ac6039d933591b976785716c7333 100644 (file)
--- a/src/mac/classic/bitmap.cpp
+++ b/src/mac/classic/bitmap.cpp
@@ -19,10 +19,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/icon.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/icon.h"
-#include "wx/image.h"
 #include "wx/xpmdecod.h"
 
 #include "wx/rawbmp.h"
@@ -957,7 +957,7 @@ bool wxBitmap::SaveFile(const wxString& filename, wxBitmapType type,
     return false;
 }
 
-bool wxBitmap::Ok() const
+bool wxBitmap::IsOk() const
 {
    return (M_BITMAPDATA && M_BITMAPDATA->m_ok);
 }