projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unselect all wxDataViewCtrl items when clicking outside of the item area.
[wxWidgets.git]
/
include
/
wx
/
statbmp.h
diff --git
a/include/wx/statbmp.h
b/include/wx/statbmp.h
index e78a347b7e3716f22a5d2df0b26bc2755bfc7338..b188edce7bed9ebb1ab4534a78065f4a8278a268 100644
(file)
--- a/
include/wx/statbmp.h
+++ b/
include/wx/statbmp.h
@@
-12,36
+12,45
@@
#ifndef _WX_STATBMP_H_BASE_
#define _WX_STATBMP_H_BASE_
#ifndef _WX_STATBMP_H_BASE_
#define _WX_STATBMP_H_BASE_
-#if defined(__GNUG__) && !defined(__APPLE__)
- #pragma interface "statbmpbase.h"
-#endif
+#include "wx/defs.h"
#if wxUSE_STATBMP
#include "wx/control.h"
#include "wx/bitmap.h"
#if wxUSE_STATBMP
#include "wx/control.h"
#include "wx/bitmap.h"
+#include "wx/icon.h"
-class WXDLLEXPORT wxIcon;
-class WXDLLEXPORT wxBitmap;
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
+extern WXDLLIMPEXP_DATA_CORE(const char) 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:
+public:
+ wxStaticBitmapBase() { }
virtual ~wxStaticBitmapBase();
virtual ~wxStaticBitmapBase();
-
+
// our interface
virtual void SetIcon(const wxIcon& icon) = 0;
virtual void SetBitmap(const wxBitmap& bitmap) = 0;
virtual wxBitmap GetBitmap() const = 0;
// our interface
virtual void SetIcon(const wxIcon& icon) = 0;
virtual void SetBitmap(const wxBitmap& bitmap) = 0;
virtual wxBitmap GetBitmap() const = 0;
+ virtual wxIcon GetIcon() const /* = 0 -- should be pure virtual */
+ {
+ // stub it out here for now as not all ports implement it (but they
+ // should)
+ return wxIcon();
+ }
- // overriden base class virtuals
- virtual bool AcceptsFocus() const { return FALSE; }
+ // overridden base class virtuals
+ virtual bool AcceptsFocus() const { return false; }
+ virtual bool HasTransparentBackground() { return true; }
protected:
protected:
- virtual wxSize DoGetBestClientSize() const;
+ // choose the default border for this window
+ virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
+ virtual wxSize DoGetBestSize() const;
+
+ wxDECLARE_NO_COPY_CLASS(wxStaticBitmapBase);
};
#if defined(__WXUNIVERSAL__)
};
#if defined(__WXUNIVERSAL__)
@@
-50,10
+59,12
@@
protected:
#include "wx/msw/statbmp.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/statbmp.h"
#include "wx/msw/statbmp.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/statbmp.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK
20
__)
#include "wx/gtk/statbmp.h"
#include "wx/gtk/statbmp.h"
+#elif defined(__WXGTK__)
+ #include "wx/gtk1/statbmp.h"
#elif defined(__WXMAC__)
#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__)