projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
typo
[wxWidgets.git]
/
src
/
mac
/
carbon
/
statbmp.cpp
diff --git
a/src/mac/carbon/statbmp.cpp
b/src/mac/carbon/statbmp.cpp
index 9a13660d97dfaa731fe787c786103706f76506f3..8948b0c3e592be5bc9179870cae0d52323b5afde 100644
(file)
--- a/
src/mac/carbon/statbmp.cpp
+++ b/
src/mac/carbon/statbmp.cpp
@@
-1,24
+1,23
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: statbmp.cpp
+// Name: s
rc/mac/carbon/s
tatbmp.cpp
// Purpose: wxStaticBitmap
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Purpose: wxStaticBitmap
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
-// Licence:
wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "statbmp.h"
-#endif
-
#include "wx/wxprec.h"
#if wxUSE_STATBMP
#include "wx/statbmp.h"
#include "wx/wxprec.h"
#if wxUSE_STATBMP
#include "wx/statbmp.h"
-#include "wx/dcclient.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/dcclient.h"
+#endif
IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
@@
-43,7
+42,7
@@
bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
m_foregroundColour = parent->GetForegroundColour() ;
m_bitmap = bitmap;
m_foregroundColour = parent->GetForegroundColour() ;
m_bitmap = bitmap;
- if ( id ==
-1
)
+ if ( id ==
wxID_ANY
)
m_windowId = (int)NewControlId();
else
m_windowId = id;
m_windowId = (int)NewControlId();
else
m_windowId = id;
@@
-51,8
+50,8
@@
bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID 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 );
- Set
Best
Size( size ) ;
-
+ Set
Initial
Size( size ) ;
+
return ret;
}
return ret;
}
@@
-64,12
+63,15
@@
void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
Refresh() ;
}
Refresh() ;
}
-void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) )
+void wxStaticBitmap::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
wxPaintDC dc(this);
PrepareDC(dc);
{
wxPaintDC dc(this);
PrepareDC(dc);
- dc.DrawBitmap( m_bitmap , 0 , 0 , TRUE ) ;
+ if (m_bitmap.Ok())
+ {
+ dc.DrawBitmap( m_bitmap , 0 , 0 , TRUE ) ;
+ }
}
wxSize wxStaticBitmap::DoGetBestSize() const
}
wxSize wxStaticBitmap::DoGetBestSize() const
@@
-78,8
+80,7
@@
wxSize wxStaticBitmap::DoGetBestSize() const
return DoGetSizeFromClientSize( wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight()) );
// this is completely arbitrary
return DoGetSizeFromClientSize( wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight()) );
// this is completely arbitrary
- return DoGetSizeFromClientSize( wxSize(16, 16) );
+ return DoGetSizeFromClientSize( wxSize(16, 16) );
}
#endif
}
#endif
-