silently ignore any X-fields in mime.types

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

diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp
index bcc80259273a94f466416428d5bf6863a858b51c..91b5df62155b3956d524e49638ea3a6b6ba9e729 100644 (file)
--- a/src/gtk1/statbmp.cpp
+++ b/src/gtk1/statbmp.cpp
@@ -11,10 +11,12 @@
 #pragma implementation "statbmp.h"
 #endif
 
 #pragma implementation "statbmp.h"
 #endif
 

-#include "wx/statbmp.h"
+#include "wx/defs.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"
 


@@ -37,18 +39,20 @@ wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap
 
 void wxStaticBitmap::CreatePixmapWidget()
 {
 
 void wxStaticBitmap::CreatePixmapWidget()
 {

-    wxCHECK_RET( m_bitmap.Ok(), "should only be called if we have a bitmap" );
+    wxCHECK_RET( m_bitmap.Ok(), wxT("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 );
 
 
     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 */
+    // insert GTK representation

     (*m_parent->m_insertCallback)(m_parent, this);
     (*m_parent->m_insertCallback)(m_parent, this);

-    
+

     gtk_widget_show( m_widget );
 
     gtk_widget_show( m_widget );
 

+    m_focusWidget = m_widget;
+

     PostCreation();
 }
 
     PostCreation();
 }
 


@@ -58,9 +62,12 @@ 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("wxXX creation failed") );
+    return FALSE;
+    }

 
     m_bitmap = bitmap;
 
 
     m_bitmap = bitmap;
 


@@ -71,17 +78,17 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
             mask = m_bitmap.GetMask()->GetBitmap();
         m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
 
             mask = m_bitmap.GetMask()->GetBitmap();
         m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
 

-        if (newSize.x == -1) newSize.x = m_bitmap.GetWidth();
-        if (newSize.y == -1) newSize.y = m_bitmap.GetHeight();
-        SetSize( newSize.x, newSize.y );
+        SetBestSize( size );

     }
     else
     {
         m_widget = gtk_label_new( "Bitmap" );
     }
     else
     {
         m_widget = gtk_label_new( "Bitmap" );

+        
+        m_focusWidget = m_widget;

 
         PostCreation();
     }
 
         PostCreation();
     }

-    
+

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


@@ -100,19 +107,20 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
         {
             gtk_widget_destroy( m_widget );
 
         {
             gtk_widget_destroy( m_widget );
 

-            /* recreate m_widget because we've created a label 
-              and not a bitmap above */
+            /* recreate m_widget because we've created a label
+               and not a bitmap above */

             CreatePixmapWidget();
         }
             CreatePixmapWidget();
         }

-       else
-       {
+        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 );
             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() );
+        }
+
+        SetBestSize(wxSize(bitmap.GetWidth(), bitmap.GetHeight()));

     }
 }
 
     }
 }
 

-#endif
+#endif // wxUSE_STATBMP
+