some fixes after global _T() => T() change

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

diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp
index bcc80259273a94f466416428d5bf6863a858b51c..186947afb2edc9808db3b90740d0a4715f788b2a 100644 (file)
--- a/src/gtk1/statbmp.cpp
+++ b/src/gtk1/statbmp.cpp
@@ -37,7 +37,7 @@ 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(), T("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() )


@@ -46,7 +46,7 @@ void wxStaticBitmap::CreatePixmapWidget()
 
     /* insert GTK representation */
     (*m_parent->m_insertCallback)(m_parent, this);
 
     /* insert GTK representation */
     (*m_parent->m_insertCallback)(m_parent, this);

-    
+

     gtk_widget_show( m_widget );
 
     PostCreation();
     gtk_widget_show( m_widget );
 
     PostCreation();


@@ -58,14 +58,19 @@ 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( T("wxXX creation failed") );
+       return FALSE;
+    }

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

+       wxSize newSize = size;
+

         GdkBitmap *mask = (GdkBitmap *) NULL;
         if ( m_bitmap.GetMask() )
             mask = m_bitmap.GetMask()->GetBitmap();
         GdkBitmap *mask = (GdkBitmap *) NULL;
         if ( m_bitmap.GetMask() )
             mask = m_bitmap.GetMask()->GetBitmap();


@@ -81,7 +86,7 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
 
         PostCreation();
     }
 
         PostCreation();
     }

-    
+

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


@@ -100,17 +105,17 @@ 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() );
     }
 }
         SetSize( m_bitmap.GetWidth(), m_bitmap.GetHeight() );
     }
 }