Always use XPMs in this sample

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

diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index d04e549b0e80dc7990bce4596cabe0c669a99b8e..68bc4efa6ac16f137f7604be33f235dfddf12ae3 100644 (file)
--- a/src/mac/carbon/statbmp.cpp
+++ b/src/mac/carbon/statbmp.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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__


@@ -38,13 +38,13 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
            const wxString& name)
 {
     SetName(name);
            const wxString& name)
 {
     SetName(name);

-       wxSize size = s ;
-       if ( bitmap.Ok() )
-       {
-       if ( size.x == -1 )
-           size.x = bitmap.GetWidth() ;
-       if ( size.y == -1 )
-           size.y = bitmap.GetHeight() ;
+    wxSize size = s ;
+    if ( bitmap.Ok() )
+    {
+        if ( size.x == -1 )
+            size.x = bitmap.GetWidth() ;
+        if ( size.y == -1 )
+            size.y = bitmap.GetHeight() ;

     }
 
     m_backgroundColour = parent->GetBackgroundColour() ;
     }
 
     m_backgroundColour = parent->GetBackgroundColour() ;


@@ -52,14 +52,14 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 
     m_bitmap = bitmap;
     if ( id == -1 )
 
     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;
 }


@@ -71,7 +71,7 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
     Refresh() ;
 }
 
     Refresh() ;
 }
 

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

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