added trailing slash

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

diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index 03f68a2ea748fba9c407f11c856fcdcf12991cc3..69b6f8b448c28a098485690e60044baa2372c065 100644 (file)
--- a/src/mac/carbon/statbmp.cpp
+++ b/src/mac/carbon/statbmp.cpp
@@ -1,16 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "statbmp.h"
+  #pragma implementation "statbmp.h"

 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"


@@ -19,7 +19,7 @@
 #include "wx/dcclient.h"
 
 #if !USE_SHARED_LIBRARY
 #include "wx/dcclient.h"
 
 #if !USE_SHARED_LIBRARY

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

 #endif
 
 /*
 #endif
 
 /*


@@ -33,43 +33,38 @@ END_EVENT_TABLE()
 bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
            const wxBitmap& bitmap,
            const wxPoint& pos,
 bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
            const wxBitmap& bitmap,
            const wxPoint& pos,

-           const wxSize& s,
+           const wxSize& size,

            long style,
            const wxString& name)
 {
     SetName(name);
            long style,
            const wxString& name)
 {
     SetName(name);

-       wxSize size = s ;

 
     m_backgroundColour = parent->GetBackgroundColour() ;
     m_foregroundColour = parent->GetForegroundColour() ;
 
     m_bitmap = bitmap;
     if ( id == -1 )
 
     m_backgroundColour = parent->GetBackgroundColour() ;
     m_foregroundColour = parent->GetForegroundColour() ;
 
     m_bitmap = bitmap;
     if ( id == -1 )

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

     else
     else

-           m_windowId = id;
+        m_windowId = id;

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

-       SetBestSize( size ) ;
+    SetBestSize( size ) ;

     
     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)
 {
     m_bitmap = bitmap;
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
     m_bitmap = bitmap;

+    InvalidateBestSize();
+    SetSize(GetBestSize());

     Refresh() ;
     Refresh() ;

-    SetBestSize(wxSize(bitmap.GetWidth(), bitmap.GetHeight()));

 }
 
 }
 

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

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


@@ -79,9 +74,6 @@ void wxStaticBitmap::OnPaint( wxPaintEvent &event )
 
 wxSize wxStaticBitmap::DoGetBestSize() const
 {
 
 wxSize wxStaticBitmap::DoGetBestSize() const
 {

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

 }
 
 }