Some manual updates; in MDI sample, child frames now have default size/position ...

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 845a1fcf0002c5bdda91a2f09cc1d10cb3b6130a..d2241e591d093489b6b99e7201180fc3a0464b51 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -34,7 +34,7 @@ wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), const wxColour& WXUNUSED(colou
 {
 };
 
 {
 };
 

-wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), const int WXUNUSED(paletteIndex) )
+wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex) )

 {
 };
 
 {
 };
 


@@ -74,6 +74,9 @@ class wxBitmapRefData: public wxObjectRefData
     int             m_width;
     int             m_height;
     int             m_bpp;
     int             m_width;
     int             m_height;
     int             m_bpp;

+#ifdef USE_GDK_IMLIB
+    GdkImlibImage  *m_image;
+#endif

     wxPalette      *m_palette;
 };
 
     wxPalette      *m_palette;
 };
 


@@ -86,16 +89,20 @@ wxBitmapRefData::wxBitmapRefData(void)
   m_height = 0;
   m_bpp = 0;
   m_palette = NULL;
   m_height = 0;
   m_bpp = 0;
   m_palette = NULL;

+#ifdef USE_GDK_IMLIB
+  m_image = NULL;
+#endif

 };
 
 wxBitmapRefData::~wxBitmapRefData(void)
 {
 #ifdef USE_GDK_IMLIB
   if (m_pixmap) gdk_imlib_free_pixmap( m_pixmap );
 };
 
 wxBitmapRefData::~wxBitmapRefData(void)
 {
 #ifdef USE_GDK_IMLIB
   if (m_pixmap) gdk_imlib_free_pixmap( m_pixmap );

+  if (m_image) gdk_imlib_destroy_image( m_image );

 #else
   if (m_pixmap) gdk_pixmap_unref( m_pixmap );
 #else
   if (m_pixmap) gdk_pixmap_unref( m_pixmap );

-  if (m_bitmap) gdk_bitmap_unref( m_bitmap );

 #endif
 #endif

+  if (m_bitmap) gdk_bitmap_unref( m_bitmap );

   if (m_mask) delete m_mask;
   if (m_palette) delete m_palette;
 };
   if (m_mask) delete m_mask;
   if (m_palette) delete m_palette;
 };


@@ -111,13 +118,14 @@ wxBitmap::wxBitmap(void)
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
 };
   
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
 };
   

-wxBitmap::wxBitmap( const int width, const int height, const int depth )
+wxBitmap::wxBitmap( int width, int height, int depth )

 {
   m_refData = new wxBitmapRefData();
   M_BMPDATA->m_mask = NULL;
   M_BMPDATA->m_pixmap = 
     gdk_pixmap_new( (GdkWindow*) &gdk_root_parent, width, height, depth );
 {
   m_refData = new wxBitmapRefData();
   M_BMPDATA->m_mask = NULL;
   M_BMPDATA->m_pixmap = 
     gdk_pixmap_new( (GdkWindow*) &gdk_root_parent, width, height, depth );

-  gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
+  M_BMPDATA->m_width = width;
+  M_BMPDATA->m_height = height;

   M_BMPDATA->m_bpp = depth;
    
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
   M_BMPDATA->m_bpp = depth;
    
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);


@@ -126,24 +134,29 @@ wxBitmap::wxBitmap( const int width, const int height, const int depth )
 wxBitmap::wxBitmap( char **bits )
 {
   m_refData = new wxBitmapRefData();
 wxBitmap::wxBitmap( char **bits )
 {
   m_refData = new wxBitmapRefData();

-  
-  GdkBitmap *mask = NULL;

 
 #ifndef USE_GDK_IMLIB
 
 #ifndef USE_GDK_IMLIB

+
+  GdkBitmap *mask = NULL;
+  

   M_BMPDATA->m_pixmap = 
     gdk_pixmap_create_from_xpm_d( (GdkWindow*) &gdk_root_parent, &mask, NULL, (gchar **) bits );
   M_BMPDATA->m_pixmap = 
     gdk_pixmap_create_from_xpm_d( (GdkWindow*) &gdk_root_parent, &mask, NULL, (gchar **) bits );

-#else
-  M_BMPDATA->m_pixmap = NULL;
-  int res = gdk_imlib_data_to_pixmap( bits, &M_BMPDATA->m_pixmap, &mask );
-#endif
-  
+    

   if (mask)
   {
     M_BMPDATA->m_mask = new wxMask();
     M_BMPDATA->m_mask->m_bitmap = mask;
   };
   if (mask)
   {
     M_BMPDATA->m_mask = new wxMask();
     M_BMPDATA->m_mask->m_bitmap = mask;
   };

-                                 
+  

   gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
   gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );

+  
+#else
+
+  M_BMPDATA->m_image = gdk_imlib_create_image_from_xpm_data( bits );
+  Render();
+  
+#endif
+                                 

   M_BMPDATA->m_bpp = 24; // ?
    
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
   M_BMPDATA->m_bpp = 24; // ?
    
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);


@@ -163,20 +176,21 @@ wxBitmap::wxBitmap( const wxBitmap* bmp )
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
 };
 
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
 };
 

-wxBitmap::wxBitmap( const wxString &filename, const int type )
+wxBitmap::wxBitmap( const wxString &filename, int type )

 {
   LoadFile( filename, type );
 };
 
 // CMB 15/5/98: add constructor for xbm bitmaps
 {
   LoadFile( filename, type );
 };
 
 // CMB 15/5/98: add constructor for xbm bitmaps

-wxBitmap::wxBitmap( const char bits[], const int width, const int height, const int WXUNUSED(depth))
+wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))

 {
   m_refData = new wxBitmapRefData();
 
   M_BMPDATA->m_mask = NULL;
   M_BMPDATA->m_bitmap = 
     gdk_bitmap_create_from_data( (GdkWindow*) &gdk_root_parent, (gchar *) bits, width, height );
 {
   m_refData = new wxBitmapRefData();
 
   M_BMPDATA->m_mask = NULL;
   M_BMPDATA->m_bitmap = 
     gdk_bitmap_create_from_data( (GdkWindow*) &gdk_root_parent, (gchar *) bits, width, height );

-  gdk_window_get_size( M_BMPDATA->m_bitmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
+  M_BMPDATA->m_width = width;
+  M_BMPDATA->m_height = height;

   M_BMPDATA->m_bpp = 1;
 
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
   M_BMPDATA->m_bpp = 1;
 
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);


@@ -227,19 +241,19 @@ int wxBitmap::GetDepth(void) const
   return M_BMPDATA->m_bpp;
 };
 
   return M_BMPDATA->m_bpp;
 };
 

-void wxBitmap::SetHeight( const int height )
+void wxBitmap::SetHeight( int height )

 {
   if (!Ok()) return;
   M_BMPDATA->m_height = height;
 };
 
 {
   if (!Ok()) return;
   M_BMPDATA->m_height = height;
 };
 

-void wxBitmap::SetWidth( const int width )
+void wxBitmap::SetWidth( int width )

 {
   if (!Ok()) return;
   M_BMPDATA->m_width = width;
 };
 
 {
   if (!Ok()) return;
   M_BMPDATA->m_width = width;
 };
 

-void wxBitmap::SetDepth( const int depth )
+void wxBitmap::SetDepth( int depth )

 {
   if (!Ok()) return;
   M_BMPDATA->m_bpp = depth;
 {
   if (!Ok()) return;
   M_BMPDATA->m_bpp = depth;


@@ -248,45 +262,74 @@ void wxBitmap::SetDepth( const int depth )
 wxMask *wxBitmap::GetMask(void) const
 {
   if (!Ok()) return NULL;
 wxMask *wxBitmap::GetMask(void) const
 {
   if (!Ok()) return NULL;

+  

   return M_BMPDATA->m_mask;
 };
 
 void wxBitmap::SetMask( wxMask *mask )
 {
   if (!Ok()) return;
   return M_BMPDATA->m_mask;
 };
 
 void wxBitmap::SetMask( wxMask *mask )
 {
   if (!Ok()) return;

+  

   if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
   M_BMPDATA->m_mask = mask;
 };
 
   if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
   M_BMPDATA->m_mask = mask;
 };
 

-bool wxBitmap::SaveFile( const wxString &WXUNUSED(name), const int WXUNUSED(type), 
+void wxBitmap::Resize( int height, int width )
+{
+  if (!Ok()) return;
+  
+#ifdef USE_GDK_IMLIB
+  
+  if (M_BMPDATA->m_bitmap) return;  // not supported for bitmaps
+  
+  if (!M_BMPDATA->m_image) RecreateImage();
+  
+  if (M_BMPDATA->m_pixmap) gdk_imlib_free_pixmap( M_BMPDATA->m_pixmap );
+  if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
+  
+  GdkImlibImage* image = gdk_imlib_clone_scaled_image( M_BMPDATA->m_image, height, width );
+  gdk_imlib_destroy_image( M_BMPDATA->m_image );
+  M_BMPDATA->m_image = image;
+  M_BMPDATA->m_height = height;
+  M_BMPDATA->m_width = width;
+  
+  Render();
+  
+#endif
+};
+
+bool wxBitmap::SaveFile( const wxString &name, int WXUNUSED(type), 

   wxPalette *WXUNUSED(palette) )
 {
   wxPalette *WXUNUSED(palette) )
 {

+#ifdef USE_GDK_IMLIB
+
+  if (!Ok()) return FALSE;
+  
+  if (!M_BMPDATA->m_image) RecreateImage();
+  
+  return gdk_imlib_save_image( M_BMPDATA->m_image, WXSTRINGCAST name, NULL );
+
+#endif
+

   return FALSE;
 };
 
   return FALSE;
 };
 

-bool wxBitmap::LoadFile( const wxString &name, const int WXUNUSED(type) )
+bool wxBitmap::LoadFile( const wxString &name, int WXUNUSED(type) )

 {
 #ifdef USE_GDK_IMLIB
 
   UnRef();
   m_refData = new wxBitmapRefData();
 {
 #ifdef USE_GDK_IMLIB
 
   UnRef();
   m_refData = new wxBitmapRefData();

-  M_BMPDATA->m_mask = NULL;
-
-  GdkBitmap *mask = NULL;

   
   

-  int res = gdk_imlib_load_file_to_pixmap( WXSTRINGCAST name, &M_BMPDATA->m_pixmap, &mask );
+  M_BMPDATA->m_image = gdk_imlib_load_image( WXSTRINGCAST name );

 
 

-  if (res != 1)
+  if (!M_BMPDATA->m_image)

   {
     UnRef();
     return FALSE;
   };
 
   {
     UnRef();
     return FALSE;
   };
 

-  if (mask)
-  {
-    M_BMPDATA->m_mask = new wxMask();
-    M_BMPDATA->m_mask->m_bitmap = mask;
-  }
+  Render();

                                  
   gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
   M_BMPDATA->m_bpp = 24; // ?
                                  
   gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
   M_BMPDATA->m_bpp = 24; // ?


@@ -312,6 +355,43 @@ GdkPixmap *wxBitmap::GetPixmap(void) const
 GdkBitmap *wxBitmap::GetBitmap(void) const
 {
   if (!Ok()) return NULL;
 GdkBitmap *wxBitmap::GetBitmap(void) const
 {
   if (!Ok()) return NULL;

+  

   return M_BMPDATA->m_bitmap;
 };
   
   return M_BMPDATA->m_bitmap;
 };
   

+void wxBitmap::DestroyImage(void)
+{
+  if (!Ok()) return;
+  
+  if (M_BMPDATA->m_image)
+  {
+    gdk_imlib_destroy_image( M_BMPDATA->m_image );
+    M_BMPDATA->m_image = NULL;
+  };
+};
+
+void wxBitmap::RecreateImage(void)
+{
+};
+
+void wxBitmap::Render(void)
+{
+  if (!Ok()) return;
+  
+#ifdef USE_GDK_IMLIB
+
+  gdk_imlib_render( M_BMPDATA->m_image, M_BMPDATA->m_image->rgb_width, M_BMPDATA->m_image->rgb_height );
+  M_BMPDATA->m_width = M_BMPDATA->m_image->rgb_width;
+  M_BMPDATA->m_height = M_BMPDATA->m_image->rgb_height;
+  M_BMPDATA->m_pixmap = gdk_imlib_move_image( M_BMPDATA->m_image );
+  GdkBitmap *mask = gdk_imlib_move_mask( M_BMPDATA->m_image );
+  if (mask)
+  {
+    M_BMPDATA->m_mask = new wxMask();
+    M_BMPDATA->m_mask->m_bitmap = mask;
+  };
+  
+#endif
+};
+
+