fixed frame style

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

diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp
index 321ca0ed0436c0e259502dceb967fa17c85cf3e4..ad12ed7cf20e36f4544ee1a55c23ab656aa91903 100644 (file)
--- a/src/gtk/statbmp.cpp
+++ b/src/gtk/statbmp.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:           wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -13,6 +13,11 @@
 
 #include "wx/statbmp.h"
 
 
 #include "wx/statbmp.h"
 

+#if wxUSE_STATBMP
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+

 //-----------------------------------------------------------------------------
 // wxStaticBitmap
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxStaticBitmap
 //-----------------------------------------------------------------------------


@@ -21,58 +26,70 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap,wxControl)
 
 wxStaticBitmap::wxStaticBitmap(void)
 {
 
 wxStaticBitmap::wxStaticBitmap(void)
 {

-};
+}

 
 wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, 
       const wxPoint &pos, const wxSize &size, 
       long style, const wxString &name )
 {
 
 wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, 
       const wxPoint &pos, const wxSize &size, 
       long style, const wxString &name )
 {

-  Create( parent, id, bitmap, pos, size, style, name );
-};
+    Create( parent, id, bitmap, pos, size, style, name );
+}

 
 bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, 
       const wxPoint &pos, const wxSize &size, 
       long style, const wxString &name )
 {
 
 bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, 
       const wxPoint &pos, const wxSize &size, 
       long style, const wxString &name )
 {

-  m_needParent = TRUE;
+    m_needParent = TRUE;

   
   

-  wxSize newSize = size;
+    wxSize newSize = size;

   
   

-  PreCreation( parent, id, pos, size, style, name );
+    PreCreation( parent, id, pos, size, style, name );

 
 

-  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 );
+    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 );

     
     

-    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 (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" );
+    }

   
   

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

   
   

-  Show( TRUE );
+    PostCreation();
+  
+    Show( TRUE );

     
     

-  return TRUE;
-};
+    return TRUE;
+}

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

-  m_bitmap = bitmap;
+    m_bitmap = bitmap;

   
   

-  if (m_bitmap.Ok())
-  {
-    GdkBitmap *mask = (GdkBitmap *) NULL;
-    if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
-    gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask );
-  }
-};
+    if (m_bitmap.Ok())
+    {
+        GdkBitmap *mask = (GdkBitmap *) NULL;
+        if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
+        gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask );
+    }
+}
+
+wxIcon& wxStaticBitmap::GetIcon()
+{
+    wxIcon *icon = wxDynamicCast(&m_bitmap, wxIcon);
+    
+    if (!icon) return wxNullIcon;
+    
+    return *icon;
+}

 
 

+#endif