No real changes, just get rid of _wxMenuAt() in wxOSX menu code.

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

diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp
index bcc80259273a94f466416428d5bf6863a858b51c..e9ee469e1ed77bd4a4536a54a398d577f8974e10 100644 (file)
--- a/src/gtk1/statbmp.cpp
+++ b/src/gtk1/statbmp.cpp
@@ -7,14 +7,13 @@
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "statbmp.h"
-#endif
-
-#include "wx/statbmp.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #if wxUSE_STATBMP
 
 
 #if wxUSE_STATBMP
 

+#include "wx/statbmp.h"
+

 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 


@@ -35,22 +34,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 );
 }
 

-void wxStaticBitmap::CreatePixmapWidget()
-{
-    wxCHECK_RET( m_bitmap.Ok(), "should only be called if we have a bitmap" );
-
-    GdkBitmap *mask = (GdkBitmap *) NULL;
-    if ( m_bitmap.GetMask() )
-        mask = m_bitmap.GetMask()->GetBitmap();
-    m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
-
-    /* insert GTK representation */
-    (*m_parent->m_insertCallback)(m_parent, this);
-    
-    gtk_widget_show( m_widget );
-
-    PostCreation();
-}
+// empty bitmap, so that we can create GtkPixmap widget:
+static char * bogus_xpm[] = {
+"2 2 1 1",
+"  c None",
+"  ",
+"  "};

 
 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,61 +47,51 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
 {
     m_needParent = TRUE;
 
 {
     m_needParent = TRUE;
 

-    wxSize newSize = size;
-
-    PreCreation( parent, id, pos, size, style, name );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxStaticBitmap creation failed") );
+        return false;
+    }

 
     m_bitmap = bitmap;
 
 
     m_bitmap = bitmap;
 

-    if (m_bitmap.Ok())
-    {
-        GdkBitmap *mask = (GdkBitmap *) NULL;
-        if ( m_bitmap.GetMask() )
-            mask = m_bitmap.GetMask()->GetBitmap();
-        m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
+    wxBitmap bmp(bitmap.Ok() ? bitmap : wxBitmap(bogus_xpm));
+    m_widget = gtk_pixmap_new(bmp.GetPixmap(), NULL);

 
 

-        if (newSize.x == -1) newSize.x = m_bitmap.GetWidth();
-        if (newSize.y == -1) newSize.y = m_bitmap.GetHeight();
-        SetSize( newSize.x, newSize.y );
-    }
-    else
-    {
-        m_widget = gtk_label_new( "Bitmap" );
+    if (bitmap.Ok())
+        SetBitmap(bitmap);

 
 

-        PostCreation();
-    }
-    
+    PostCreation(size);

     m_parent->DoAddChild( this );
 
     m_parent->DoAddChild( this );
 

-    Show( TRUE );
-
-    return TRUE;
+    return true;

 }
 
 void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
 {
 }
 
 void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
 {

-    bool hasWidget = m_bitmap.Ok();

     m_bitmap = bitmap;
 
     if (m_bitmap.Ok())
     {
     m_bitmap = bitmap;
 
     if (m_bitmap.Ok())
     {

-        if (!hasWidget)
-        {
-            gtk_widget_destroy( m_widget );
-
-            /* recreate m_widget because we've created a label 
-              and not a bitmap above */
-            CreatePixmapWidget();
-        }
-       else
-       {
-            GdkBitmap *mask = (GdkBitmap *) NULL;
-            if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
-            gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask );
-       }
-    
-        SetSize( m_bitmap.GetWidth(), m_bitmap.GetHeight() );
+        GdkBitmap *mask = NULL;
+        if (m_bitmap.GetMask())
+            mask = m_bitmap.GetMask()->GetBitmap();
+
+        gtk_pixmap_set(GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask);
+
+        InvalidateBestSize();
+        SetSize(GetBestSize());

     }
 }
 
     }
 }
 

-#endif
+// static
+wxVisualAttributes
+wxStaticBitmap::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    // TODO: overload to allow using gtk_pixmap_new?
+    return GetDefaultAttributesFromGTKWidget(gtk_label_new);
+}
+
+#endif // wxUSE_STATBMP
+