Return NULL from wxWindow::GetCapture() when the capture is being lost.

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

diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp
index b12acdde77a64e2cec979b3370ea185b5b4ddfb4..bfe5c1ef384c71e16385907ae861570619da5234 100644 (file)
--- a/src/gtk/statbmp.cpp
+++ b/src/gtk/statbmp.cpp
@@ -1,8 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statbmp.cpp
+// Name:        src/gtk/statbmp.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -20,8 +19,6 @@
 // wxStaticBitmap
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap,wxControl)
-
 wxStaticBitmap::wxStaticBitmap(void)
 {
 }
@@ -49,7 +46,7 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
     m_widget = gtk_image_new();
     g_object_ref(m_widget);
 
-    if (bitmap.Ok())
+    if (bitmap.IsOk())
         SetBitmap(bitmap);
 
     PostCreation(size);
@@ -62,7 +59,7 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &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
@@ -77,8 +74,7 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
 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