projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for #11647: text from WriteText not scrolled to be visible in wxRichTextCtrl
[wxWidgets.git]
/
src
/
generic
/
statbmpg.cpp
diff --git
a/src/generic/statbmpg.cpp
b/src/generic/statbmpg.cpp
index 8f6701dccb57f78a11e32794e57ac862bd0edd5f..735c0b9d32ca8ea8f37766334ccc0f037f5130ba 100644
(file)
--- a/
src/generic/statbmpg.cpp
+++ b/
src/generic/statbmpg.cpp
@@
-18,8
+18,6
@@
#include "wx/generic/statbmpg.h"
#include "wx/generic/statbmpg.h"
-IMPLEMENT_DYNAMIC_CLASS(wxGenericStaticBitmap, wxStaticBitmapBase)
-
bool wxGenericStaticBitmap::Create(wxWindow *parent, wxWindowID id,
const wxBitmap& bitmap,
const wxPoint& pos, const wxSize& size,
bool wxGenericStaticBitmap::Create(wxWindow *parent, wxWindowID id,
const wxBitmap& bitmap,
const wxPoint& pos, const wxSize& size,
@@
-40,5
+38,12
@@
void wxGenericStaticBitmap::OnPaint(wxPaintEvent& WXUNUSED(event))
dc.DrawBitmap(m_bitmap, 0, 0, true);
}
dc.DrawBitmap(m_bitmap, 0, 0, true);
}
+// under OSX_cocoa is a define, avoid duplicate info
+#ifndef wxGenericStaticBitmap
+
+IMPLEMENT_DYNAMIC_CLASS(wxGenericStaticBitmap, wxStaticBitmapBase)
+
+#endif
+
#endif // wxUSE_STATBMP
#endif // wxUSE_STATBMP