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 e9ee469e1ed77bd4a4536a54a398d577f8974e10..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)
 {
 }


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

-    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);
 

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

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


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

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

     {
         GdkBitmap *mask = NULL;
         if (m_bitmap.GetMask())
     {
         GdkBitmap *mask = NULL;
         if (m_bitmap.GetMask())