Fix broken and missing DataView interface items for Phoenix

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

diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp
index aeb95223ec0407ac674d4d0a271a9b85dd27a83d..a1c66085e38a85bb14a3e595cef23cb39ca5e38a 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$


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

-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap,wxControl)
-

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


@@ -47,8 +45,9 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
     m_bitmap = bitmap;
 
     m_widget = gtk_image_new();
     m_bitmap = bitmap;
 
     m_widget = gtk_image_new();

+    g_object_ref(m_widget);

 
 

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

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


@@ -61,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