Disable wxUSE_ENH_METAFILE for wxGTK builds.

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

diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp
index a7e372c93d22d4268560c52ca7030f95b7a970b9..19391bbb7e69026ad3af802578b24ab0bb0aa766 100644 (file)
--- a/src/gtk/statbmp.cpp
+++ b/src/gtk/statbmp.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -47,7 +47,7 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
     m_widget = gtk_image_new();
     g_object_ref(m_widget);
 
     m_widget = gtk_image_new();
     g_object_ref(m_widget);
 

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

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


@@ -60,7 +60,7 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
 {
     m_bitmap = bitmap;
 
 {
     m_bitmap = bitmap;
 

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

     {
         // always use pixbuf, because pixmap mask does not
         // work with disabled images in some themes
     {
         // always use pixbuf, because pixmap mask does not
         // work with disabled images in some themes


@@ -75,8 +75,7 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
 wxVisualAttributes
 wxStaticBitmap::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
 wxVisualAttributes
 wxStaticBitmap::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {

-    // TODO: overload to allow using gtk_pixmap_new?
-    return GetDefaultAttributesFromGTKWidget(gtk_label_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_image_new());

 }
 
 #endif // wxUSE_STATBMP
 }
 
 #endif // wxUSE_STATBMP