AddBook ignores wxMac paths (still won't work)

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

diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp
index e46ae8134d89d68019ecf6d159a48d7c5195a18a..392fa2fa4c6e39422112d0cd5b4fe7b15b6f1a0b 100644 (file)
--- a/src/gtk/statbmp.cpp
+++ b/src/gtk/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,7 +39,7 @@ wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap
 
 void wxStaticBitmap::CreatePixmapWidget()
 {
 
 void wxStaticBitmap::CreatePixmapWidget()
 {

-    wxCHECK_RET( m_bitmap.Ok(), _T("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() )
 
     GdkBitmap *mask = (GdkBitmap *) NULL;
     if ( m_bitmap.GetMask() )


@@ -58,9 +60,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,9 +76,7 @@ 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
     {
     }
     else
     {


@@ -111,8 +114,9 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
             gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask );
         }
 
             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
+