Update to docs incl. wxString first stab; added a couple of palette-related events...

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

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 05c3136acc931d021e1589e97e9bc9ede7f71add..d2241e591d093489b6b99e7201180fc3a0464b51 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -89,6 +89,9 @@ 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)
 };
 
 wxBitmapRefData::~wxBitmapRefData(void)


@@ -121,7 +124,8 @@ wxBitmap::wxBitmap( int width, int height, int depth )
   M_BMPDATA->m_mask = NULL;
   M_BMPDATA->m_pixmap = 
     gdk_pixmap_new( (GdkWindow*) &gdk_root_parent, width, height, depth );
   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);


@@ -144,6 +148,8 @@ wxBitmap::wxBitmap( char **bits )
     M_BMPDATA->m_mask->m_bitmap = mask;
   };
   
     M_BMPDATA->m_mask->m_bitmap = mask;
   };
   

+  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 );
 #else
 
   M_BMPDATA->m_image = gdk_imlib_create_image_from_xpm_data( bits );


@@ -151,7 +157,6 @@ wxBitmap::wxBitmap( char **bits )
   
 #endif
                                  
   
 #endif
                                  

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

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


@@ -184,7 +189,8 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth
   M_BMPDATA->m_mask = NULL;
   M_BMPDATA->m_bitmap = 
     gdk_bitmap_create_from_data( (GdkWindow*) &gdk_root_parent, (gchar *) bits, width, height );
   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);


@@ -272,8 +278,6 @@ void wxBitmap::Resize( int height, int width )
 {
   if (!Ok()) return;
   
 {
   if (!Ok()) return;
   

-  return;
-  

 #ifdef USE_GDK_IMLIB
   
   if (M_BMPDATA->m_bitmap) return;  // not supported for bitmaps
 #ifdef USE_GDK_IMLIB
   
   if (M_BMPDATA->m_bitmap) return;  // not supported for bitmaps


@@ -377,7 +381,8 @@ void wxBitmap::Render(void)
 #ifdef USE_GDK_IMLIB
 
   gdk_imlib_render( M_BMPDATA->m_image, M_BMPDATA->m_image->rgb_width, M_BMPDATA->m_image->rgb_height );
 #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_pixmap = gdk_imlib_move_image( M_BMPDATA->m_image );
   GdkBitmap *mask = gdk_imlib_move_mask( M_BMPDATA->m_image );
   if (mask)