Disable wxUSE_ENH_METAFILE for wxGTK builds.

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

diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp
index a33dcd4ecc1400fd69714d2339bc80c4a0286649..c92e00c40cc5b4b38de1467dd9c82d06ee5610e7 100644 (file)
--- a/src/gtk1/statbmp.cpp
+++ b/src/gtk1/statbmp.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        statbmp.cpp
+// Name:        src/gtk1/statbmp.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -21,8 +21,6 @@
 // wxStaticBitmap
 //-----------------------------------------------------------------------------
 
 // wxStaticBitmap
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap,wxControl)
-

 wxStaticBitmap::wxStaticBitmap(void)
 {
 }
 wxStaticBitmap::wxStaticBitmap(void)
 {
 }


@@ -34,14 +32,12 @@ wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap
     Create( parent, id, bitmap, pos, size, style, name );
 }
 
     Create( parent, id, bitmap, pos, size, style, name );
 }
 

-#ifndef __WXGTK20__

 // empty bitmap, so that we can create GtkPixmap widget:
 static char * bogus_xpm[] = {
 "2 2 1 1",
 // empty bitmap, so that we can create GtkPixmap widget:
 static char * bogus_xpm[] = {
 "2 2 1 1",

-"      c None",
+"  c None",

 "  ",
 "  "};
 "  ",
 "  "};

-#endif

 
 bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
                              const wxPoint &pos, const wxSize &size,
 
 bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
                              const wxPoint &pos, const wxSize &size,


@@ -58,14 +54,10 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
 
     m_bitmap = bitmap;
 
 
     m_bitmap = bitmap;
 

-#ifdef __WXGTK20__
-    m_widget = gtk_image_new();
-#else
-    wxBitmap bmp(bitmap.Ok() ? bitmap : wxBitmap(bogus_xpm));
+    wxBitmap bmp(bitmap.IsOk() ? bitmap : wxBitmap(bogus_xpm));

     m_widget = gtk_pixmap_new(bmp.GetPixmap(), NULL);
     m_widget = gtk_pixmap_new(bmp.GetPixmap(), NULL);

-#endif

 
 

-    if (bitmap.Ok())
+    if (bitmap.IsOk())

         SetBitmap(bitmap);
 
     PostCreation(size);
         SetBitmap(bitmap);
 
     PostCreation(size);


@@ -78,24 +70,13 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
 {
     m_bitmap = bitmap;
 
 {
     m_bitmap = bitmap;
 

-    if (m_bitmap.Ok())
+    if (m_bitmap.IsOk())

     {
     {

-        GdkBitmap *mask = (GdkBitmap *) NULL;
+        GdkBitmap *mask = NULL;

         if (m_bitmap.GetMask())
             mask = m_bitmap.GetMask()->GetBitmap();
         if (m_bitmap.GetMask())
             mask = m_bitmap.GetMask()->GetBitmap();

-    
-#ifdef __WXGTK20__
-        if (m_bitmap.HasPixbuf())
-        {
-            gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget),
-                                      m_bitmap.GetPixbuf());
-        }
-        else
-            gtk_image_set_from_pixmap(GTK_IMAGE(m_widget),
-                                      m_bitmap.GetPixmap(), mask);
-#else
+

         gtk_pixmap_set(GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask);
         gtk_pixmap_set(GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask);

-#endif

 
         InvalidateBestSize();
         SetSize(GetBestSize());
 
         InvalidateBestSize();
         SetSize(GetBestSize());