projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SourceForge patch #654210 to fix naming/numbering shared libs under OS X
[wxWidgets.git]
/
include
/
wx
/
mac
/
statbmp.h
diff --git
a/include/wx/mac/statbmp.h
b/include/wx/mac/statbmp.h
index 62291ce3ce09fe3ae10a9d8508bd177cdd59b2b9..04b36469bfb477754e05ad98c02956ccc9420185 100644
(file)
--- a/
include/wx/mac/statbmp.h
+++ b/
include/wx/mac/statbmp.h
@@
-12,15
+12,13
@@
#ifndef _WX_STATBMP_H_
#define _WX_STATBMP_H_
#ifndef _WX_STATBMP_H_
#define _WX_STATBMP_H_
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(__APPLE__)
#pragma interface "statbmp.h"
#endif
#pragma interface "statbmp.h"
#endif
-#include "wx/
control
.h"
+#include "wx/
icon
.h"
-WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
-
-class WXDLLEXPORT wxStaticBitmap: public wxControl
+class WXDLLEXPORT wxStaticBitmap: public wxStaticBitmapBase
{
DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
public:
{
DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
public:
@@
-47,19
+45,22
@@
class WXDLLEXPORT wxStaticBitmap: public wxControl
virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
- virtual void OnPaint( wxPaintEvent &event ) ;
- void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+ void OnPaint( wxPaintEvent &event ) ;
- inline const wxBitmap& GetBitmap() const { return m_messageBitmap; }
- const wxIcon& GetIcon() const { return (const wxIcon&) GetBitmap() ; }
+ wxBitmap GetBitmap() const { return m_bitmap; }
+ wxIcon GetIcon() const
+ {
+ // icons and bitmaps are really the same thing in wxMac
+ return (const wxIcon &)m_bitmap;
+ }
void SetIcon(const wxIcon& icon) { SetBitmap( (const wxBitmap &)icon ) ; }
// overriden base class virtuals
virtual bool AcceptsFocus() const { return FALSE; }
void SetIcon(const wxIcon& icon) { SetBitmap( (const wxBitmap &)icon ) ; }
// overriden base class virtuals
virtual bool AcceptsFocus() const { return FALSE; }
- wxSize DoGetBestSize() const ;
+
virtual
wxSize DoGetBestSize() const ;
protected:
protected:
- wxBitmap m_
messageB
itmap;
+ wxBitmap m_
b
itmap;
DECLARE_EVENT_TABLE()
};
DECLARE_EVENT_TABLE()
};