cleanup - reformatting

[wxWidgets.git] / src / mac / carbon / statbmp.cpp

diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index 8bd5fecb71b2a5853109deb3c8512a27e11a8859..e7ce2f1633631d9903085bbfcd66d89d09a144fb 100644 (file)
--- a/src/mac/carbon/statbmp.cpp
+++ b/src/mac/carbon/statbmp.cpp
@@ -1,19 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        statbmp.cpp
 // Purpose:     wxStaticBitmap
 /////////////////////////////////////////////////////////////////////////////
 // Name:        statbmp.cpp
 // Purpose:     wxStaticBitmap

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "statbmp.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_STATBMP

 
 #include "wx/statbmp.h"
 
 #include "wx/statbmp.h"

+#include "wx/dcclient.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 


@@ -21,7 +22,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
  * wxStaticBitmap
  */
 
  * wxStaticBitmap
  */
 

-BEGIN_EVENT_TABLE(wxStaticBitmap, wxControl)
+BEGIN_EVENT_TABLE(wxStaticBitmap, wxStaticBitmapBase)

     EVT_PAINT(wxStaticBitmap::OnPaint)
 END_EVENT_TABLE()
 
     EVT_PAINT(wxStaticBitmap::OnPaint)
 END_EVENT_TABLE()
 


@@ -37,45 +38,47 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     m_backgroundColour = parent->GetBackgroundColour() ;
     m_foregroundColour = parent->GetForegroundColour() ;
 
     m_backgroundColour = parent->GetBackgroundColour() ;
     m_foregroundColour = parent->GetForegroundColour() ;
 

-    m_messageBitmap = bitmap;
-
+    m_bitmap = bitmap;

     if ( id == -1 )
     if ( id == -1 )

-           m_windowId = (int)NewControlId();
+          m_windowId = (int)NewControlId();

     else
     else

-           m_windowId = id;
+        m_windowId = id;

 
     m_windowStyle = style;
 
 
     m_windowStyle = style;
 

-    bool ret = wxControl::Create( parent, id, pos, size, style , name );
+    bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
+    SetBestSize( size ) ;

     
     

-       SetSizeOrDefault() ;
-       

     return ret;
 }
 
     return ret;
 }
 

-void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    wxControl::SetSize( x , y , width , height , sizeFlags ) ;
-}
-

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

-    m_messageBitmap = bitmap;
-    SetSizeOrDefault();
+    m_bitmap = bitmap;
+    InvalidateBestSize();
+    SetSize(GetBestSize());
+    Refresh() ;

 }
 }

-void wxStaticBitmap::OnPaint( wxPaintEvent &event ) 
+
+void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) ) 

 {
     wxPaintDC dc(this);
     PrepareDC(dc);
 {
     wxPaintDC dc(this);
     PrepareDC(dc);

-       dc.SetPalette( *m_messageBitmap.GetPalette() ) ;
-       dc.DrawBitmap( m_messageBitmap , 0 , 0 ) ;
+
+    if (m_bitmap.Ok())
+    {
+        dc.DrawBitmap( m_bitmap , 0 , 0 , TRUE ) ;
+    }

 }
 
 wxSize wxStaticBitmap::DoGetBestSize() const
 {
 }
 
 wxSize wxStaticBitmap::DoGetBestSize() const
 {

-    if ( m_messageBitmap.Ok() )
-        return wxSize(m_messageBitmap.GetWidth(), m_messageBitmap.GetHeight());
-    else
-        return wxSize(16, 16);  // completely arbitrary
+    if ( m_bitmap.Ok() )
+        return DoGetSizeFromClientSize( wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight()) );
+
+    // this is completely arbitrary
+    return DoGetSizeFromClientSize( wxSize(16, 16) ); 

 }
 
 }
 

+#endif
+