projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add virtual destructors to fix GCC4 warnings.
[wxWidgets.git]
/
include
/
wx
/
statbmp.h
diff --git
a/include/wx/statbmp.h
b/include/wx/statbmp.h
index 73f773c9f81d48bb0a93971e8c180cf613b79a56..b188edce7bed9ebb1ab4534a78065f4a8278a268 100644
(file)
--- a/
include/wx/statbmp.h
+++ b/
include/wx/statbmp.h
@@
-20,10
+20,10
@@
#include "wx/bitmap.h"
#include "wx/icon.h"
#include "wx/bitmap.h"
#include "wx/icon.h"
-extern WXDLL
EXPORT_DATA(const wxC
har) wxStaticBitmapNameStr[];
+extern WXDLL
IMPEXP_DATA_CORE(const c
har) wxStaticBitmapNameStr[];
// a control showing an icon or a bitmap
// a control showing an icon or a bitmap
-class WXDLL
EXPORT
wxStaticBitmapBase : public wxControl
+class WXDLL
IMPEXP_CORE
wxStaticBitmapBase : public wxControl
{
public:
wxStaticBitmapBase() { }
{
public:
wxStaticBitmapBase() { }
@@
-40,14
+40,17
@@
public:
return wxIcon();
}
return wxIcon();
}
- // overriden base class virtuals
+ // overrid
d
en base class virtuals
virtual bool AcceptsFocus() const { return false; }
virtual bool HasTransparentBackground() { return true; }
protected:
virtual bool AcceptsFocus() const { return false; }
virtual bool HasTransparentBackground() { return true; }
protected:
+ // choose the default border for this window
+ virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetBestSize() const;
- DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)
+ wxDECLARE_NO_COPY_CLASS(wxStaticBitmapBase);
};
#if defined(__WXUNIVERSAL__)
};
#if defined(__WXUNIVERSAL__)
@@
-61,7
+64,7
@@
protected:
#elif defined(__WXGTK__)
#include "wx/gtk1/statbmp.h"
#elif defined(__WXMAC__)
#elif defined(__WXGTK__)
#include "wx/gtk1/statbmp.h"
#elif defined(__WXMAC__)
- #include "wx/
mac
/statbmp.h"
+ #include "wx/
osx
/statbmp.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/statbmp.h"
#elif defined(__WXPM__)
#elif defined(__WXCOCOA__)
#include "wx/cocoa/statbmp.h"
#elif defined(__WXPM__)