Watford C++ related changes. Unfortunately, the linker now gives a GPF.

[wxWidgets.git] / src / gtk / bitmap.cpp

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 4a3ef743548ef0256a07f601efbd09bf3d2def8f..4e8e6a7ca48641c34fa387c36d22f50a5026450b 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -112,24 +112,24 @@ bool wxMask::Create( const wxBitmap& bitmap,
     
     for (int j = 0; j < image.GetHeight(); j++)
     {
     
     for (int j = 0; j < image.GetHeight(); j++)
     {

-      int start_x = -1;
-      int i;
-      for (i = 0; i < image.GetWidth(); i++)
+        int start_x = -1;
+        int i;
+        for (i = 0; i < image.GetWidth(); i++)

         {
         {

-           if ((data[index] == red) &&
-               (data[index+1] == green) &&
-               (data[index+2] == blue))
-           {
-               if (start_x == -1)
-                   start_x = i;
-           }
-           else
-           {
-               if (start_x != -1)
-               {
-                   gdk_draw_line( m_bitmap, gc, start_x, j, i-1, j );
-                   start_x = -1;
-               }
+               if ((data[index] == red) &&
+                   (data[index+1] == green) &&
+                   (data[index+2] == blue))
+               {
+                   if (start_x == -1)
+                       start_x = i;
+               }
+               else
+               {
+                   if (start_x != -1)
+                       {
+                           gdk_draw_line( m_bitmap, gc, start_x, j, i-1, j );
+                           start_x = -1;
+                   }

             }
             index += 3;
         }
             }
             index += 3;
         }


@@ -193,16 +193,16 @@ GdkBitmap *wxMask::GetBitmap() const
 class wxBitmapRefData: public wxObjectRefData
 {
 public:
 class wxBitmapRefData: public wxObjectRefData
 {
 public:

-  wxBitmapRefData();
-  ~wxBitmapRefData();
-
-  GdkPixmap      *m_pixmap;
-  GdkBitmap      *m_bitmap;
-  wxMask         *m_mask;
-  int             m_width;
-  int             m_height;
-  int             m_bpp;
-  wxPalette      *m_palette;
+    wxBitmapRefData();
+    ~wxBitmapRefData();
+
+    GdkPixmap      *m_pixmap;
+    GdkBitmap      *m_bitmap;
+    wxMask         *m_mask;
+    int             m_width;
+    int             m_height;
+    int             m_bpp;
+    wxPalette      *m_palette;

 };
 
 wxBitmapRefData::wxBitmapRefData()
 };
 
 wxBitmapRefData::wxBitmapRefData()


@@ -388,7 +388,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 {
     wxCHECK_MSG( Ok() &&
                  (rect.x >= 0) && (rect.y >= 0) && 
 {
     wxCHECK_MSG( Ok() &&
                  (rect.x >= 0) && (rect.y >= 0) && 

-                (rect.x+rect.width <= M_BMPDATA->m_width) && (rect.y+rect.height <= M_BMPDATA->m_height),
+                        (rect.x+rect.width <= M_BMPDATA->m_width) && (rect.y+rect.height <= M_BMPDATA->m_height),

                  wxNullBitmap, wxT("invalid bitmap or bitmap region") );
     
     wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp );
                  wxNullBitmap, wxT("invalid bitmap or bitmap region") );
     
     wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp );


@@ -397,14 +397,14 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
     if (ret.GetPixmap())
     {
         GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
     if (ret.GetPixmap())
     {
         GdkGC *gc = gdk_gc_new( ret.GetPixmap() );

-       gdk_draw_pixmap( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
-       gdk_gc_destroy( gc );
+           gdk_draw_pixmap( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
+           gdk_gc_destroy( gc );

     }
     else
     {
         GdkGC *gc = gdk_gc_new( ret.GetBitmap() );
     }
     else
     {
         GdkGC *gc = gdk_gc_new( ret.GetBitmap() );

-       gdk_draw_bitmap( ret.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
-       gdk_gc_destroy( gc );
+           gdk_draw_bitmap( ret.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
+           gdk_gc_destroy( gc );

     }
     
     if (GetMask())
     }
     
     if (GetMask())


@@ -414,10 +414,10 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
         mask->m_bitmap = gdk_pixmap_new( parent, rect.width, rect.height, 1 );
        
         GdkGC *gc = gdk_gc_new( mask->m_bitmap );
         mask->m_bitmap = gdk_pixmap_new( parent, rect.width, rect.height, 1 );
        
         GdkGC *gc = gdk_gc_new( mask->m_bitmap );

-       gdk_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, 0, 0, rect.x, rect.y, rect.width, rect.height );
-       gdk_gc_destroy( gc );
+           gdk_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, 0, 0, rect.x, rect.y, rect.width, rect.height );
+           gdk_gc_destroy( gc );

        
        

-       ret.SetMask( mask );
+           ret.SetMask( mask );

     }
     
     return ret;
     }
     
     return ret;