gdk_gc_unref -> g_object_unref

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

diff --git a/src/mac/classic/bitmap.cpp b/src/mac/classic/bitmap.cpp
index 6cbaa9d9b76178bd55967c581059beb46677d666..e51b3ca7b6b18662392e06d50ccda2d448d22646 100644 (file)
--- a/src/mac/classic/bitmap.cpp
+++ b/src/mac/classic/bitmap.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "bitmap.h"
-#endif
-

 #include "wx/defs.h"
 
 #include "wx/bitmap.h"
 #include "wx/defs.h"
 
 #include "wx/bitmap.h"


@@ -168,7 +164,7 @@ OSErr SetupCIconHandlePixMap( CIconHandle icon , short depth , Rect  *bounds , C
     else
         newColors = nil;
 
     else
         newColors = nil;
 

-    /* If no errors occured, return a handle to the new off-screen PixMap */
+    /* If no errors occurred, return a handle to the new off-screen PixMap */

     if (error != noErr)
         {
         if (newColors != nil)
     if (error != noErr)
         {
         if (newColors != nil)


@@ -512,10 +508,10 @@ wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
 
 bool wxBitmap::CreateFromXpm(const char **bits)
 {
 
 bool wxBitmap::CreateFromXpm(const char **bits)
 {

-    wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
+    wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") );

     wxXPMDecoder decoder;
     wxImage img = decoder.ReadData(bits);
     wxXPMDecoder decoder;
     wxImage img = decoder.ReadData(bits);

-    wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )
+    wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") );

     *this = wxBitmap(img);
     return TRUE;
 }
     *this = wxBitmap(img);
     return TRUE;
 }


@@ -722,8 +718,8 @@ bool wxBitmap::Create(void *data, wxBitmapType type, int width, int height, int
 
 wxBitmap::wxBitmap(const wxImage& image, int depth)
 {
 
 wxBitmap::wxBitmap(const wxImage& image, int depth)
 {

-    wxCHECK_RET( image.Ok(), wxT("invalid image") )
-    wxCHECK_RET( depth == -1, wxT("invalid bitmap depth") )
+    wxCHECK_RET( image.Ok(), wxT("invalid image") );
+    wxCHECK_RET( depth == -1, wxT("invalid bitmap depth") );

 
     m_refData = new wxBitmapRefData();
 
 
     m_refData = new wxBitmapRefData();