projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
document various enumerations defined in defs.h; give a name to the anonymous enum...
[wxWidgets.git]
/
include
/
wx
/
msw
/
statbmp.h
diff --git
a/include/wx/msw/statbmp.h
b/include/wx/msw/statbmp.h
index ba494939a7b641de6aa4f3c0dd0cfdf561c674b1..7989fce4bc7bdc0b9c3c98261a80c485dedb116c 100644
(file)
--- a/
include/wx/msw/statbmp.h
+++ b/
include/wx/msw/statbmp.h
@@
-16,10
+16,10
@@
#include "wx/icon.h"
#include "wx/bitmap.h"
#include "wx/icon.h"
#include "wx/bitmap.h"
-extern WXDLL
EXPORT_DATA
(const char) wxStaticBitmapNameStr[];
+extern WXDLL
IMPEXP_DATA_CORE
(const char) wxStaticBitmapNameStr[];
// a control showing an icon or a bitmap
// a control showing an icon or a bitmap
-class WXDLL
EXPORT
wxStaticBitmap : public wxStaticBitmapBase
+class WXDLL
IMPEXP_CORE
wxStaticBitmap : public wxStaticBitmapBase
{
public:
wxStaticBitmap() { Init(); }
{
public:
wxStaticBitmap() { Init(); }
@@
-58,7
+58,6
@@
public:
virtual bool CanApplyThemeBorder() const { return false; }
protected:
virtual bool CanApplyThemeBorder() const { return false; }
protected:
- virtual wxBorder GetDefaultBorder() const;
virtual wxSize DoGetBestSize() const;
// ctor/dtor helpers
virtual wxSize DoGetBestSize() const;
// ctor/dtor helpers
@@
-71,6
+70,13
@@
protected:
void SetImage(const wxGDIImage* image);
void SetImageNoCopy( wxGDIImage* image );
void SetImage(const wxGDIImage* image);
void SetImageNoCopy( wxGDIImage* image );
+#ifndef __WXWINCE__
+ // draw the bitmap ourselves here if the OS can't do it correctly (if it
+ // can we leave it to it)
+ void DoPaintManually(wxPaintEvent& event);
+#endif // !__WXWINCE__
+
+
// we can have either an icon or a bitmap
bool m_isIcon;
wxGDIImage *m_image;
// we can have either an icon or a bitmap
bool m_isIcon;
wxGDIImage *m_image;