Make wxr resources work in Unicode mode.

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

diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index 86a8528929d10ae721c5025b8d0d48a35a22e8e8..522d2ed2302ee306d0859a81644799b0f415984c 100644 (file)
--- a/src/mac/carbon/statbmp.cpp
+++ b/src/mac/carbon/statbmp.cpp
@@ -10,10 +10,13 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

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

 #endif
 
 #endif
 

+#include "wx/defs.h"
+

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

+#include "wx/dcclient.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)


@@ -23,24 +26,31 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
  * wxStaticBitmap
  */
 
  * wxStaticBitmap
  */
 

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

     EVT_PAINT(wxStaticBitmap::OnPaint)
 END_EVENT_TABLE()
 
 bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
            const wxBitmap& bitmap,
            const wxPoint& pos,
     EVT_PAINT(wxStaticBitmap::OnPaint)
 END_EVENT_TABLE()
 
 bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
            const wxBitmap& bitmap,
            const wxPoint& pos,

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

            long style,
            const wxString& name)
 {
     SetName(name);
            long style,
            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() ;
+    }

 
     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 )
            m_windowId = (int)NewControlId();
     else
     if ( id == -1 )
            m_windowId = (int)NewControlId();
     else


@@ -48,36 +58,29 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID 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;
+    SetSize(wxSize(bitmap.GetWidth(), bitmap.GetHeight()));
+    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 ) ;
+
+    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
+    return wxWindow::DoGetBestSize() ;

 }
 
 }